From 77500400bad1686522588fdcef455ab0ac3f3e34 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 1 Oct 2017 08:33:02 +0000 Subject: [PATCH] ppsspp: fix up --- pkgs/misc/emulators/ppsspp/default.nix | 4 +++- pkgs/top-level/aliases.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index 4c6093b0ba6f..159eefad6662 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -5,7 +5,7 @@ assert withGamepads -> (SDL2 != null); with stdenv.lib; stdenv.mkDerivation rec { - name = "PPSSPP-${version}"; + name = "ppsspp-${version}"; version = "1.4.2"; src = fetchFromGitHub { @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { mv assets $out/share/ppsspp ''; + enableParallelBuilding = true; + meta = { homepage = https://www.ppsspp.org/; description = "A PSP emulator for Android, Windows, Mac and Linux, written in C++"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3abaa7402fba..9de635058317 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -25,7 +25,7 @@ in mapAliases (rec { accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19 - adobeReader = adobe-reader; + adobeReader = adobe-reader; # added 2013-11-04 aircrackng = aircrack-ng; # added 2016-01-14 ammonite-repl = ammonite; # added 2017-05-02 arduino_core = arduino-core; # added 2015-02-04 @@ -117,6 +117,7 @@ mapAliases (rec { pidgin-with-plugins = pidgin; # added 2016-06 pidginlatexSF = pidginlatex; # added 2014-11-02 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 + PPSSPP = ppsspp; # added 2017-10-01 prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 QmidiNet = qmidinet; # added 2016-05-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cffd36ee4122..20ed6f43f397 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19107,7 +19107,7 @@ with pkgs; pjsip = callPackage ../applications/networking/pjsip { }; - PPSSPP = libsForQt5.callPackage ../misc/emulators/ppsspp { }; + ppsspp = libsForQt5.callPackage ../misc/emulators/ppsspp { }; pt = callPackage ../applications/misc/pt { };