diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-09 23:44:37 -0400 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-09 23:44:37 -0400 |
commit | a79a8f29bc509b2d51158846c9562e64e1239b4c (patch) | |
tree | aad21af4ec95ec19091ab9c9e813baa544948e27 /pkgs/misc | |
parent | 52566c3b7b5f96d198dd6e57e2db37012fd9b71b (diff) | |
download | nixpkgs-a79a8f29bc509b2d51158846c9562e64e1239b4c.tar nixpkgs-a79a8f29bc509b2d51158846c9562e64e1239b4c.tar.gz nixpkgs-a79a8f29bc509b2d51158846c9562e64e1239b4c.tar.bz2 nixpkgs-a79a8f29bc509b2d51158846c9562e64e1239b4c.tar.lz nixpkgs-a79a8f29bc509b2d51158846c9562e64e1239b4c.tar.xz nixpkgs-a79a8f29bc509b2d51158846c9562e64e1239b4c.tar.zst nixpkgs-a79a8f29bc509b2d51158846c9562e64e1239b4c.zip |
waf: use wafConfigureFlags for waf flags
This avoids the potential conflict between autoconf flags and the waf flags. There is some overlap between the two but waf errors when it doesn’t recognize the flag.
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 e63d27ec403..1199f987bb6 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 a47c2018444..556b66befe6 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" |