b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #215623 from atorres1985-contrib/ppsspp

Browse source 
ppsspp: don't rely on libsForQt5.callPackage
This commit is contained in:
Anderson Torres 2023-02-10 00:23:59 -03:00 committed by GitHub
parent 79361edd56 1aa6e47d97
commit ebe3d7b722
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/emulators/ppsspp/default.nix
View file

@ -7,17 +7,15 @@
, ffmpeg
, glew
, libffi
, libsForQt5
, libzip
, makeDesktopItem
, makeWrapper
, pkg-config
, python3
, qtbase
, qtmultimedia
, snappy
, vulkan-loader
, wayland
, wrapQtAppsHook
, zlib
, enableQt ? false
, enableVulkan ? true
@ -27,6 +25,7 @@
let
# experimental, see https://github.com/hrydgard/ppsspp/issues/13845
vulkanWayland = enableVulkan && forceWayland;
inherit (libsForQt5) qtbase qtmultimedia wrapQtAppsHook;
in
# Only SDL frontend needs to specify whether to use Wayland
assert forceWayland -> !enableQt;

2
pkgs/top-level/all-packages.nix
View file

@ -2190,7 +2190,7 @@ with pkgs;
pcsxr = callPackage ../applications/emulators/pcsxr { };
ppsspp = libsForQt5.callPackage ../applications/emulators/ppsspp { };
ppsspp = callPackage ../applications/emulators/ppsspp { };
ppsspp-sdl = ppsspp;