diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index 732500be0fcf..439566de0cad 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -2,17 +2,21 @@ , withGamepads ? true, SDL # SDL is used for gamepad functionality }: +assert withGamepads -> (SDL != null); + let - version = "0.9.9.1"; + version = "1.1.0"; fstat = x: fn: "-D" + fn + "=" + (if x then "ON" else "OFF"); -in stdenv.mkDerivation { +in +with stdenv.lib; +stdenv.mkDerivation rec{ name = "PPSSPP-${version}"; src = fetchgit { url = "https://github.com/hrydgard/ppsspp.git"; - sha256 = "0fdbda0b4dfbecacd01850f1767e980281fed4cc34a21df26ab3259242d8c352"; - rev = "bf709790c4fed9cd211f755acaa650ace0f7555a"; + rev = "8c8e5de89d52b8bcb968227d96cbf049d04d1241"; fetchSubmodules = true; + sha256 = "71dfa0be045f31969b1d6ab4f1adf6a208f9ef4834d708bc7bf6d9195efb5f80"; }; buildInputs = [ zlib libpng pkgconfig qt4 ] @@ -21,11 +25,11 @@ in stdenv.mkDerivation { configurePhase = "cd Qt && qmake PPSSPPQt.pro"; installPhase = "mkdir -p $out/bin && cp ppsspp $out/bin"; - meta = with stdenv.lib; { + meta = { homepage = "http://www.ppsspp.org/"; description = "A PSP emulator, the Qt4 version"; license = licenses.gpl2Plus; - maintainers = [ maintainers.fuuzetsu ]; + maintainers = [ maintainers.fuuzetsu maintainers.AndersonTorres ]; platforms = platforms.linux ++ platforms.darwin ++ platforms.cygwin; }; -} \ No newline at end of file +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7505c8658027..6bc69da5f287 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14842,7 +14842,7 @@ let polytable = callPackage ../tools/typesetting/tex/polytable { }; - PPSSPP = callPackage ../misc/emulators/ppsspp { }; + PPSSPP = callPackage ../misc/emulators/ppsspp { SDL = SDL2; }; uae = callPackage ../misc/emulators/uae { };