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.
This commit is contained in:
Philip Potter 2016-02-13 15:56:35 +00:00
parent 77f8f35d57
commit 8a8d0bd46a

View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, scons, zlib, SDL, lua5, pkgconfig}: {stdenv, fetchurl, scons, zlib, SDL, lua5_1, pkgconfig}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "fceux-2.2.2"; name = "fceux-2.2.2";
@ -9,7 +9,7 @@ stdenv.mkDerivation {
}; };
buildInputs = [ buildInputs = [
scons zlib SDL lua5 pkgconfig scons zlib SDL lua5_1 pkgconfig
]; ];
phases = "unpackPhase buildPhase"; phases = "unpackPhase buildPhase";
@ -23,7 +23,7 @@ stdenv.mkDerivation {
export CC="gcc" export CC="gcc"
export CXX="g++" export CXX="g++"
mkdir -p "$out" "$out/share/applications" "$out/share/pixmaps" 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 = { meta = {