Merge pull request #213910 from NickCao/ppsspp-fixup
ppsspp: fixup after https://github.com/NixOS/nixpkgs/pull/213533
This commit is contained in:
@@ -115,10 +115,10 @@ stdenv.mkDerivation (self: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://www.ppsspp.org/";
|
||||
description = "A HLE Playstation Portable emulator, written in C++ ("
|
||||
++ (if enableQt then "Qt" else "SDL + headless") ++ ")";
|
||||
+ (if enableQt then "Qt" else "SDL + headless") + ")";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.AndersonTorres ];
|
||||
platforms = lib.platforms.linux;
|
||||
|
||||
@@ -2171,7 +2171,7 @@ with pkgs;
|
||||
|
||||
pcsxr = callPackage ../applications/emulators/pcsxr { };
|
||||
|
||||
ppsspp = callPackage ../applications/emulators/ppsspp { };
|
||||
ppsspp = libsForQt5.callPackage ../applications/emulators/ppsspp { };
|
||||
|
||||
ppsspp-sdl = ppsspp;
|
||||
|
||||
@@ -2181,7 +2181,6 @@ with pkgs;
|
||||
};
|
||||
|
||||
ppsspp-qt = ppsspp.override {
|
||||
inherit (libsForQt5) qtbase qtmultimedia wrapQtAppsHook;
|
||||
enableQt = true;
|
||||
enableVulkan = false; # https://github.com/hrydgard/ppsspp/issues/11628
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user