diff options
author | Joachim F <joachifm@users.noreply.github.com> | 2017-03-30 14:15:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-30 14:15:56 +0100 |
commit | c5a99f89e635e42f0dbb9f04353cc8fd46cc184f (patch) | |
tree | e2fa9e5782f08fd2c5ccc0d13162672cb307a478 /pkgs/misc | |
parent | 09f24f628b64ada599616271ff4809eddb59eb0c (diff) | |
parent | 75f5ed248901919786327d8d0d55a79b65e2cb3f (diff) |
Merge pull request #24272 from therealpxc/ppsspp
ppsspp: 1.1.0 -> 1.3
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/emulators/ppsspp/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index 3f02304c0d42e..611cc84325c19 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -5,7 +5,7 @@ assert withGamepads -> (SDL != null); let - version = "1.1.0"; + version = "1.3"; fstat = x: fn: "-D" + fn + "=" + (if x then "ON" else "OFF"); in with stdenv.lib; @@ -14,14 +14,16 @@ stdenv.mkDerivation rec{ src = fetchgit { url = "https://github.com/hrydgard/ppsspp.git"; - rev = "8c8e5de89d52b8bcb968227d96cbf049d04d1241"; + rev = "refs/tags/v${version}"; fetchSubmodules = true; - sha256 = "1q21qskzni0nvz2yi2m17gjh4i9nrs2l4fm4y2dww9m29xpvzw3x"; + sha256 = "0l8vgdlw657r8gv7rz8iqa6zd9zrbzw10pwhcnahzil7w9qrd03g"; }; - buildInputs = [ zlib libpng pkgconfig qt4 qmake4Hook ] + buildInputs = [ zlib libpng qt4 ] ++ (if withGamepads then [ SDL ] else [ ]); + nativeBuildInputs = [ pkgconfig qmake4Hook ]; + qmakeFlags = [ "PPSSPPQt.pro" ]; preConfigure = "cd Qt"; @@ -31,7 +33,7 @@ stdenv.mkDerivation rec{ homepage = "http://www.ppsspp.org/"; description = "A PSP emulator, the Qt4 version"; license = licenses.gpl2Plus; - maintainers = [ maintainers.fuuzetsu maintainers.AndersonTorres ]; + maintainers = with maintainers; [ fuuzetsu AndersonTorres ]; platforms = platforms.linux ++ platforms.darwin ++ platforms.cygwin; }; } |