diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-14 13:31:39 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-14 13:31:39 +0100 |
| commit | c6e31d0767dcf41b91bbbc151c265872f9394c55 (patch) | |
| tree | 6e54af47c9452c76b53b4cffa3a81284444b6030 /pkgs/misc/emulators | |
| parent | f7993885500f927f2f22eb7b3249568dce6a0bac (diff) | |
| parent | c747894638a08b7a6dc096d6ef09a1094f1c260f (diff) | |
| download | nixpkgs-c6e31d0767dcf41b91bbbc151c265872f9394c55.tar nixpkgs-c6e31d0767dcf41b91bbbc151c265872f9394c55.tar.gz nixpkgs-c6e31d0767dcf41b91bbbc151c265872f9394c55.tar.bz2 nixpkgs-c6e31d0767dcf41b91bbbc151c265872f9394c55.tar.lz nixpkgs-c6e31d0767dcf41b91bbbc151c265872f9394c55.tar.xz nixpkgs-c6e31d0767dcf41b91bbbc151c265872f9394c55.tar.zst nixpkgs-c6e31d0767dcf41b91bbbc151c265872f9394c55.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/ppsspp/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index 619938ba5c6..1e75230a139 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qtmultimedia +{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qtmultimedia , glew, libzip, snappy, zlib, withGamepads ? true, SDL2 }: assert withGamepads -> (SDL2 != null); with stdenv.lib; -stdenv.mkDerivation rec { +mkDerivation rec { pname = "ppsspp"; version = "1.4.2"; |