Merge pull request #58504 from symphorien/static-proot

Static proot, wafHook cross compilation
2019-04-13 12:04:32 -04:00
parent 14a008dba6 a79a8f29bc
commit 59c81160e7
15 changed files with 44 additions and 42 deletions
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
    export CXXFLAGS="-I${libX11.dev}/include/X11 -DLIBDIR=\\\"${mupen64plus}/lib/\\\""
    export LDFLAGS="-lwx_gtk2u_adv-2.9"

-    configureFlagsArray+=("--mupenapi=$APIDIR" "--wxconfig=`type -P wx-config`")
+    wafConfigureFlagsArray+=("--mupenapi=$APIDIR" "--wxconfig=`type -P wx-config`")
  '';

  NIX_CFLAGS_COMPILE = "-fpermissive";