Unverified Commit a5059482 authored by Anderson Torres's avatar Anderson Torres Committed by GitHub
Browse files

Merge pull request #186551 from AndersonTorres/MISC 

ppsspp: get rid of libsForQt5.callPackage
parents 4fb60f31 92dcbeaf

pkgs/applications/emulators/ppsspp/default.nix

+14 −8
Original line number Diff line number Diff line 
{ 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

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -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 { };