From 1aa6e47d9711ca0403f0d73307fb79ddcaf1e42a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 1 Feb 2023 06:55:14 -0300 Subject: [PATCH] ppsspp: don't rely on libsForQt5.callPackage --- pkgs/applications/emulators/ppsspp/default.nix | 5 ++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/emulators/ppsspp/default.nix b/pkgs/applications/emulators/ppsspp/default.nix index a2664e12641d..7713c145948c 100644 --- a/pkgs/applications/emulators/ppsspp/default.nix +++ b/pkgs/applications/emulators/ppsspp/default.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 345252b22a5a..3fb8cf6a0bcc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;