diff options
author | Austin Seipp <aseipp@pobox.com> | 2014-06-03 20:32:51 -0500 |
---|---|---|
committer | Austin Seipp <aseipp@pobox.com> | 2014-06-03 20:32:51 -0500 |
commit | 9087dcb9eac8f6188a4fc579f882073d8e3e4904 (patch) | |
tree | 95c2e9ccecf04c83e3c28ecde9aaa73351991f5b /pkgs/misc | |
parent | ed3c01f142f3c8605405bdd6c6c82015f6dc87f5 (diff) | |
parent | 59f98d0d8c33a54997e38a0ca1ba4df942de2514 (diff) | |
download | nixpkgs-9087dcb9eac8f6188a4fc579f882073d8e3e4904.tar nixpkgs-9087dcb9eac8f6188a4fc579f882073d8e3e4904.tar.gz nixpkgs-9087dcb9eac8f6188a4fc579f882073d8e3e4904.tar.bz2 nixpkgs-9087dcb9eac8f6188a4fc579f882073d8e3e4904.tar.lz nixpkgs-9087dcb9eac8f6188a4fc579f882073d8e3e4904.tar.xz nixpkgs-9087dcb9eac8f6188a4fc579f882073d8e3e4904.tar.zst nixpkgs-9087dcb9eac8f6188a4fc579f882073d8e3e4904.zip |
Merge pull request #2785 from Fuuzetsu/ppsspp
PPSSPP: 0.9.8
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/emulators/ppsspp/bump-version-to-0.9.8.patch | 22 | ||||
-rw-r--r-- | pkgs/misc/emulators/ppsspp/default.nix | 33 |
2 files changed, 55 insertions, 0 deletions
diff --git a/pkgs/misc/emulators/ppsspp/bump-version-to-0.9.8.patch b/pkgs/misc/emulators/ppsspp/bump-version-to-0.9.8.patch new file mode 100644 index 00000000000..5e474d6f747 --- /dev/null +++ b/pkgs/misc/emulators/ppsspp/bump-version-to-0.9.8.patch @@ -0,0 +1,22 @@ +From 48f6bf352154511d5acddfe44dd241c6a9ed92d7 Mon Sep 17 00:00:00 2001 +From: Bhavin <bhavin192@users.noreply.github.com> +Date: Tue, 6 May 2014 22:44:58 +0530 +Subject: [PATCH] Update vaersion to 0.9.8 + +It was 0.9.6 :( +--- + Qt/Settings.pri | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Qt/Settings.pri b/Qt/Settings.pri +index 8b4c1d7..67949f2 100644 +--- a/Qt/Settings.pri ++++ b/Qt/Settings.pri +@@ -1,4 +1,4 @@ +-VERSION = 0.9.6 ++VERSION = 0.9.8 + DEFINES += USING_QT_UI USE_FFMPEG + unix:!qnx:!symbian:!mac: CONFIG += linux + maemo5|contains(MEEGO_EDITION,harmattan): CONFIG += maemo +-- +1.9.3 diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix new file mode 100644 index 00000000000..db5e42e37ea --- /dev/null +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchgit, zlib, libpng, qt4, pkgconfig +, withGamepads ? true, SDL # SDL is used for gamepad functionality +}: + +let + version = "0.9.8"; + fstat = x: fn: "-D" + fn + "=" + (if x then "ON" else "OFF"); +in stdenv.mkDerivation { + name = "PPSSPP-${version}"; + + src = fetchgit { + url = "https://github.com/hrydgard/ppsspp.git"; + sha256 = "11sqhb2m3502dzbizahh1w2dl7jv3fipwxyrmryj8fyaqqw0i36q"; + rev = "cbc46be3f91cb8558fbb4b175b14e8e16cbf0243"; + fetchSubmodules = true; + }; + + # Upstream forgot to bump a version in one file. + patches = [ ./bump-version-to-0.9.8.patch ]; + + buildInputs = [ zlib libpng pkgconfig qt4 ] + ++ (if withGamepads then [ SDL ] else [ ]); + + configurePhase = "cd Qt && qmake PPSSPPQt.pro"; + installPhase = "mkdir -p $out/bin && cp PPSSPPQt $out/bin"; + + meta = with stdenv.lib; { + homepage = "http://www.ppsspp.org/"; + description = "A PSP emulator, the Qt4 version."; + license = licenses.gpl2Plus; + maintainers = [ maintainers.fuuzetsu ]; + }; +} \ No newline at end of file |