diff options
author | Philip Potter <philip.g.potter@gmail.com> | 2016-02-13 15:56:35 +0000 |
---|---|---|
committer | Philip Potter <philip.g.potter@gmail.com> | 2016-02-13 15:56:35 +0000 |
commit | 8a8d0bd46ab6e3ba4b0557af03d319ad35c24b39 (patch) | |
tree | 249a55c744e9896128097df366849f8ce3c7503f /pkgs/misc/emulators | |
parent | 77f8f35d57618c1ba456d968524f2fb2c3448295 (diff) | |
download | nixlib-8a8d0bd46ab6e3ba4b0557af03d319ad35c24b39.tar nixlib-8a8d0bd46ab6e3ba4b0557af03d319ad35c24b39.tar.gz nixlib-8a8d0bd46ab6e3ba4b0557af03d319ad35c24b39.tar.bz2 nixlib-8a8d0bd46ab6e3ba4b0557af03d319ad35c24b39.tar.lz nixlib-8a8d0bd46ab6e3ba4b0557af03d319ad35c24b39.tar.xz nixlib-8a8d0bd46ab6e3ba4b0557af03d319ad35c24b39.tar.zst nixlib-8a8d0bd46ab6e3ba4b0557af03d319ad35c24b39.zip |
fix fceux
fceux needs lua 5.1; 5.2 seems to have introduced breaking API changes. I removed the SYSTEM_LUA argument because we do want to build with the system-provided lua, not the lua bundled in the fceux tarball.
Diffstat (limited to 'pkgs/misc/emulators')
-rw-r--r-- | pkgs/misc/emulators/fceux/default.nix | 6 |
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 = { |