From f6822e8bb18e43abf6069c0cea1d1f69ad8fb627 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 1 Feb 2023 14:08:18 +0800 Subject: [PATCH 1/2] ppsspp: fixup after https://github.com/NixOS/nixpkgs/pull/213533 --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8916723831a..8aa2193bf212 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 }; From 42c048fb3af82aee71e0ea4fcca5cf690fc7c855 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 1 Feb 2023 15:10:12 +0800 Subject: [PATCH 2/2] ppsspp: fixup meta.description --- pkgs/applications/emulators/ppsspp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/ppsspp/default.nix b/pkgs/applications/emulators/ppsspp/default.nix index e730131ed6ff..a2664e12641d 100644 --- a/pkgs/applications/emulators/ppsspp/default.nix +++ b/pkgs/applications/emulators/ppsspp/default.nix @@ -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;