diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-09 20:37:51 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-11 00:50:16 +0300 |
commit | ce823a8dbc7fe15520f96ef2270a01dc2e0ebead (patch) | |
tree | 3680f6dcbec294e3608f8fb4661e4b86670fcc3c /pkgs/games | |
parent | 83f1a2408015523f7852c26332c6e3d09acaf7af (diff) | |
download | nixlib-ce823a8dbc7fe15520f96ef2270a01dc2e0ebead.tar nixlib-ce823a8dbc7fe15520f96ef2270a01dc2e0ebead.tar.gz nixlib-ce823a8dbc7fe15520f96ef2270a01dc2e0ebead.tar.bz2 nixlib-ce823a8dbc7fe15520f96ef2270a01dc2e0ebead.tar.lz nixlib-ce823a8dbc7fe15520f96ef2270a01dc2e0ebead.tar.xz nixlib-ce823a8dbc7fe15520f96ef2270a01dc2e0ebead.tar.zst nixlib-ce823a8dbc7fe15520f96ef2270a01dc2e0ebead.zip |
gambatte: Fix sandbox build
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/gambatte/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/gambatte/fix-scons-paths.patch | 15 |
2 files changed, 17 insertions, 0 deletions
diff --git a/pkgs/games/gambatte/default.nix b/pkgs/games/gambatte/default.nix index 969f231dedaf..dabcfb19db04 100644 --- a/pkgs/games/gambatte/default.nix +++ b/pkgs/games/gambatte/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { buildInputs = [ scons qt4 ]; + patches = [ ./fix-scons-paths.patch ]; + buildPhase = '' ./build_qt.sh ''; diff --git a/pkgs/games/gambatte/fix-scons-paths.patch b/pkgs/games/gambatte/fix-scons-paths.patch new file mode 100644 index 000000000000..ea10ee4163b4 --- /dev/null +++ b/pkgs/games/gambatte/fix-scons-paths.patch @@ -0,0 +1,15 @@ +diff --git a/libgambatte/SConstruct b/libgambatte/SConstruct +index e882514..87e1eaa 100644 +--- a/libgambatte/SConstruct ++++ b/libgambatte/SConstruct +@@ -5,7 +5,9 @@ vars = Variables() + vars.Add('CC') + vars.Add('CXX') + +-env = Environment(CPPPATH = ['src', 'include', '../common'], ++import os ++env = Environment(ENV = os.environ, ++ CPPPATH = ['src', 'include', '../common'], + CFLAGS = global_cflags + global_defines, + CXXFLAGS = global_cxxflags + global_defines, + variables = vars) |