about summary refs log tree commit diff
path: root/pkgs/misc
diff options
context:
space:
mode:
authorPascal Wittmann <PascalWittmann@gmx.net>2016-02-14 14:24:17 +0100
committerPascal Wittmann <PascalWittmann@gmx.net>2016-02-14 14:24:17 +0100
commitddeb1d8c43fa286348c0e0f9c7c081df3c61da9f (patch)
treecfd24ad7fbf95a39f746d531bb5a71c45f383815 /pkgs/misc
parent75a83eff8d76ceff2e2e71fb6f2535e8d455ea21 (diff)
parent8a8d0bd46ab6e3ba4b0557af03d319ad35c24b39 (diff)
downloadnixlib-ddeb1d8c43fa286348c0e0f9c7c081df3c61da9f.tar
nixlib-ddeb1d8c43fa286348c0e0f9c7c081df3c61da9f.tar.gz
nixlib-ddeb1d8c43fa286348c0e0f9c7c081df3c61da9f.tar.bz2
nixlib-ddeb1d8c43fa286348c0e0f9c7c081df3c61da9f.tar.lz
nixlib-ddeb1d8c43fa286348c0e0f9c7c081df3c61da9f.tar.xz
nixlib-ddeb1d8c43fa286348c0e0f9c7c081df3c61da9f.tar.zst
nixlib-ddeb1d8c43fa286348c0e0f9c7c081df3c61da9f.zip
Merge pull request #12971 from philandstuff/fix-fceux
fix fceux
Diffstat (limited to 'pkgs/misc')
-rw-r--r--pkgs/misc/emulators/fceux/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/misc/emulators/fceux/default.nix
index 48860f17aaf2..64d5dfd69a7b 100644
--- a/pkgs/misc/emulators/fceux/default.nix
+++ b/pkgs/misc/emulators/fceux/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, scons, zlib, SDL, lua5, pkgconfig}:
+{stdenv, fetchurl, scons, zlib, SDL, lua5_1, pkgconfig}:
 
 stdenv.mkDerivation {
   name = "fceux-2.2.2";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    scons zlib SDL lua5 pkgconfig
+    scons zlib SDL lua5_1 pkgconfig
   ];
 
   phases = "unpackPhase buildPhase";
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     export CC="gcc"
     export CXX="g++"
     mkdir -p "$out" "$out/share/applications" "$out/share/pixmaps"
-    scons --prefix="$out" OPENGL=false GTK=false CREATE_AVI=false LOGO=false SYSTEM_LUA=false install
+    scons --prefix="$out" OPENGL=false GTK=false CREATE_AVI=false LOGO=false install
   '';
 
   meta = {