diff options
author | Anderson Torres <torres.anderson.85@protonmail.com> | 2023-08-22 23:14:12 -0300 |
---|---|---|
committer | Anderson Torres <torres.anderson.85@protonmail.com> | 2023-09-01 15:21:21 +0000 |
commit | 9f52275e52509dc667e6b42514ce1531416254a5 (patch) | |
tree | 480d9d3c7f67069beffab13db3fb5573e3e23cad | |
parent | df9537506709430d3e32e4f0214940a15c0c597c (diff) |
treewide: change wafConfigureFlags to configureFlags
Because it makes no sense to treat it differently.
-rw-r--r-- | pkgs/applications/audio/ardour/6.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/audio/ardour/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/audio/guitarix/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/office/semantik/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/audio/lvtk/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/ldb/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/ndn-cxx/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/talloc/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/tdb/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/tevent/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/build-managers/waf/setup-hook.sh | 2 | ||||
-rw-r--r-- | pkgs/misc/jackaudio/default.nix | 3 | ||||
-rw-r--r-- | pkgs/servers/nfd/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/samba/4.x.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/ndn-tools/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/saldl/default.nix | 2 |
16 files changed, 17 insertions, 16 deletions
diff --git a/pkgs/applications/audio/ardour/6.nix b/pkgs/applications/audio/ardour/6.nix index fa6cfce7977a..026e23649edd 100644 --- a/pkgs/applications/audio/ardour/6.nix +++ b/pkgs/applications/audio/ardour/6.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { vamp-plugin-sdk ] ++ lib.optionals videoSupport [ harvid xjadeo ]; - wafConfigureFlags = [ + configureFlags = [ "--cxx11" "--docs" "--freedesktop" diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index a39aa7242e72..9589f8b087b7 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -150,7 +150,7 @@ stdenv.mkDerivation rec { vamp-plugin-sdk ] ++ lib.optionals videoSupport [ harvid xjadeo ]; - wafConfigureFlags = [ + configureFlags = [ "--cxx11" "--docs" "--freedesktop" diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index e40084ff5a1b..abe24fb22453 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { zita-resampler ]; - wafConfigureFlags = [ + configureFlags = [ "--no-font-cache-update" "--shared-lib" "--no-desktop-update" diff --git a/pkgs/applications/office/semantik/default.nix b/pkgs/applications/office/semantik/default.nix index 7e240823cb42..538fbe9011b9 100644 --- a/pkgs/applications/office/semantik/default.nix +++ b/pkgs/applications/office/semantik/default.nix @@ -85,7 +85,7 @@ mkDerivation rec { kdelibs4support ]; - wafConfigureFlags = [ + configureFlags = [ "--qtlibs=${lib.getLib qtbase}/lib" ]; diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index af784d80a3aa..6b16826d7d68 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { sed -e '/print/d' -i wscript ''; - wafConfigureFlags = [ + configureFlags = [ "--boost-includes=${boost.dev}/include" "--boost-libs=${boost.out}/lib" ]; diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 753dee9e3f0c..96e8ded194aa 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { wafPath = "buildtools/bin/waf"; - wafConfigureFlags = [ + configureFlags = [ "--bundled-libraries=NONE" "--builtin-libraries=replace" "--without-ldb-lmdb" diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index 7ab607b01f4e..dc79c78e8b4f 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost179 openssl sqlite ]; - wafConfigureFlags = [ + configureFlags = [ "--with-openssl=${openssl.dev}" "--boost-includes=${boost179.dev}/include" "--boost-libs=${boost179.out}/lib" diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 5fad3c1c5121..137cc8b4757d 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { wafPath = "buildtools/bin/waf"; - wafConfigureFlags = [ + configureFlags = [ "--enable-talloc-compat1" "--bundled-libraries=NONE" "--builtin-libraries=replace" diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index 562a422f91d6..05de9fbe6380 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { wafPath = "buildtools/bin/waf"; - wafConfigureFlags = [ + configureFlags = [ "--bundled-libraries=NONE" "--builtin-libraries=replace" ]; diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index df773c6eabf8..b224b17875b4 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { wafPath = "buildtools/bin/waf"; - wafConfigureFlags = [ + configureFlags = [ "--bundled-libraries=NONE" "--builtin-libraries=replace" ]; diff --git a/pkgs/development/tools/build-managers/waf/setup-hook.sh b/pkgs/development/tools/build-managers/waf/setup-hook.sh index 2593b0a9d808..34d2ca6a3641 100644 --- a/pkgs/development/tools/build-managers/waf/setup-hook.sh +++ b/pkgs/development/tools/build-managers/waf/setup-hook.sh @@ -18,7 +18,7 @@ wafConfigurePhase() { local flagsArray=( $prefixFlag - $wafConfigureFlags "${wafConfigureFlagsArray[@]}" + $configureFlags "${configureFlagsArray[@]}" ${configureTargets:-configure} ) diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 01ad92c74aee..cff9bf23f793 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -51,7 +51,8 @@ stdenv.mkDerivation (finalAttrs: { ''; dontAddWafCrossFlags = true; - wafConfigureFlags = [ + + configureFlags = [ "--classic" "--autostart=${if (optDbus != null) then "dbus" else "classic"}" ] ++ lib.optional (optDbus != null) "--dbus" diff --git a/pkgs/servers/nfd/default.nix b/pkgs/servers/nfd/default.nix index e790d07a8f66..2b6655106de7 100644 --- a/pkgs/servers/nfd/default.nix +++ b/pkgs/servers/nfd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config sphinx waf.hook ]; buildInputs = [ libpcap ndn-cxx openssl websocketpp ] ++ lib.optional withSystemd systemd; - wafConfigureFlags = [ + configureFlags = [ "--boost-includes=${boost179.dev}/include" "--boost-libs=${boost179.out}/lib" "--with-tests" diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 6343b987a03d..85cc6b0e2472 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { export PYTHONHASHSEED=1 ''; - wafConfigureFlags = [ + configureFlags = [ "--with-static-modules=NONE" "--with-shared-modules=ALL" "--enable-fhs" diff --git a/pkgs/tools/networking/ndn-tools/default.nix b/pkgs/tools/networking/ndn-tools/default.nix index 01c05a5d1ac7..ea6c731f214e 100644 --- a/pkgs/tools/networking/ndn-tools/default.nix +++ b/pkgs/tools/networking/ndn-tools/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config sphinx waf.hook ]; buildInputs = [ libpcap ndn-cxx openssl ]; - wafConfigureFlags = [ + configureFlags = [ "--boost-includes=${boost.dev}/include" "--boost-libs=${boost.out}/lib" "--with-tests" diff --git a/pkgs/tools/networking/saldl/default.nix b/pkgs/tools/networking/saldl/default.nix index 7f37e61f5117..c131a709f734 100644 --- a/pkgs/tools/networking/saldl/default.nix +++ b/pkgs/tools/networking/saldl/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl libevent ]; - wafConfigureFlags = [ "--saldl-version ${version}" "--no-werror" ]; + configureFlags = [ "--saldl-version ${version}" "--no-werror" ]; outputs = [ "out" "man" ]; |