Merge pull request #213910 from NickCao/ppsspp-fixup

ppsspp: fixup after https://github.com/NixOS/nixpkgs/pull/213533
This commit is contained in:
Weijia Wang 2023-02-01 09:05:22 +01:00 committed by GitHub
commit bb1be98f56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions

View file

@ -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;

View file

@ -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
};