From 92dcbeaf1ebda27879005bc01e77ab95217ef3bf Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 13 Aug 2022 21:53:16 -0300 Subject: [PATCH] ppsspp: get rid of libsForQt5.callPackage And use the new functional framework for recursive style attributes. --- .../applications/emulators/ppsspp/default.nix | 22 ++++++++++++------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/emulators/ppsspp/default.nix b/pkgs/applications/emulators/ppsspp/default.nix index 14121a49bde5..1264768f387d 100644 --- a/pkgs/applications/emulators/ppsspp/default.nix +++ b/pkgs/applications/emulators/ppsspp/default.nix @@ -1,37 +1,43 @@ -{ mkDerivation +{ lib +, stdenv , fetchFromGitHub , SDL2 , cmake , ffmpeg , glew -, lib , libzip , pkg-config , python3 , qtbase , qtmultimedia , snappy +, wrapQtAppsHook , zlib }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ppsspp"; version = "1.13.1"; src = fetchFromGitHub { owner = "hrydgard"; - repo = pname; - rev = "v${version}"; + repo = "ppsspp"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; sha256 = "sha256-WsFy2aSOmkII2Lte5et4W6qj0AXUKWWkYe88T0OQP08="; }; postPatch = '' - substituteInPlace git-version.cmake --replace unknown ${src.rev} + substituteInPlace git-version.cmake --replace unknown ${finalAttrs.src.rev} substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share ''; - nativeBuildInputs = [ cmake pkg-config python3 ]; + nativeBuildInputs = [ + cmake + pkg-config + python3 + wrapQtAppsHook + ]; buildInputs = [ SDL2 @@ -68,5 +74,5 @@ mkDerivation rec { maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; }; -} +}) # TODO: add SDL headless port diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc3dd0f3b6c7..d0bb337c74ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1493,7 +1493,9 @@ with pkgs; pcsxr = callPackage ../applications/emulators/pcsxr { }; - ppsspp = libsForQt5.callPackage ../applications/emulators/ppsspp { }; + ppsspp = callPackage ../applications/emulators/ppsspp { + inherit (libsForQt5) qtbase qtmultimedia wrapQtAppsHook; + }; proton-caller = callPackage ../applications/emulators/proton-caller { };