diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-04-13 12:04:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-13 12:04:32 -0400 |
| commit | 59c81160e7df5d5d1b143b1d2e46385debc6bfea (patch) | |
| tree | 6357d03a315666055aebcda1da18751dbaae229a /pkgs/misc | |
| parent | 14a008dba64ab32c677eee005d1cda3fe460b763 (diff) | |
| parent | a79a8f29bc509b2d51158846c9562e64e1239b4c (diff) | |
| download | nixlib-59c81160e7df5d5d1b143b1d2e46385debc6bfea.tar nixlib-59c81160e7df5d5d1b143b1d2e46385debc6bfea.tar.gz nixlib-59c81160e7df5d5d1b143b1d2e46385debc6bfea.tar.bz2 nixlib-59c81160e7df5d5d1b143b1d2e46385debc6bfea.tar.lz nixlib-59c81160e7df5d5d1b143b1d2e46385debc6bfea.tar.xz nixlib-59c81160e7df5d5d1b143b1d2e46385debc6bfea.tar.zst nixlib-59c81160e7df5d5d1b143b1d2e46385debc6bfea.zip | |
Merge pull request #58504 from symphorien/static-proot
Static proot, wafHook cross compilation
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/emulators/wxmupen64plus/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/jackaudio/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix index e63d27ec4039..1199f987bb6a 100644 --- a/pkgs/misc/emulators/wxmupen64plus/default.nix +++ b/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -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"; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index a47c20184442..556b66befe63 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { export NIX_CFLAGS_COMPILE="-F${CoreFoundation}/Library/Frameworks $NIX_CFLAGS_COMPILE" ''; - configureFlags = [ + wafConfigureFlags = [ "--classic" "--autostart=${if (optDbus != null) then "dbus" else "classic"}" ] ++ optional (optDbus != null) "--dbus" |