treewide: change wafConfigureFlags to configureFlags

Because it makes no sense to treat it differently.
This commit is contained in:
Anderson Torres
2023-09-01 15:21:21 +00:00
parent df95375067
commit 9f52275e52
16 changed files with 17 additions and 16 deletions
+1 -1
View File
@@ -129,7 +129,7 @@ stdenv.mkDerivation rec {
vamp-plugin-sdk
] ++ lib.optionals videoSupport [ harvid xjadeo ];
wafConfigureFlags = [
configureFlags = [
"--cxx11"
"--docs"
"--freedesktop"
+1 -1
View File
@@ -150,7 +150,7 @@ stdenv.mkDerivation rec {
vamp-plugin-sdk
] ++ lib.optionals videoSupport [ harvid xjadeo ];
wafConfigureFlags = [
configureFlags = [
"--cxx11"
"--docs"
"--freedesktop"
+1 -1
View File
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
zita-resampler
];
wafConfigureFlags = [
configureFlags = [
"--no-font-cache-update"
"--shared-lib"
"--no-desktop-update"
@@ -85,7 +85,7 @@ mkDerivation rec {
kdelibs4support
];
wafConfigureFlags = [
configureFlags = [
"--qtlibs=${lib.getLib qtbase}/lib"
];
@@ -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"
];
+1 -1
View File
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
wafPath = "buildtools/bin/waf";
wafConfigureFlags = [
configureFlags = [
"--bundled-libraries=NONE"
"--builtin-libraries=replace"
"--without-ldb-lmdb"
@@ -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"
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
wafPath = "buildtools/bin/waf";
wafConfigureFlags = [
configureFlags = [
"--enable-talloc-compat1"
"--bundled-libraries=NONE"
"--builtin-libraries=replace"
+1 -1
View File
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
wafPath = "buildtools/bin/waf";
wafConfigureFlags = [
configureFlags = [
"--bundled-libraries=NONE"
"--builtin-libraries=replace"
];
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
wafPath = "buildtools/bin/waf";
wafConfigureFlags = [
configureFlags = [
"--bundled-libraries=NONE"
"--builtin-libraries=replace"
];
@@ -18,7 +18,7 @@ wafConfigurePhase() {
local flagsArray=(
$prefixFlag
$wafConfigureFlags "${wafConfigureFlagsArray[@]}"
$configureFlags "${configureFlagsArray[@]}"
${configureTargets:-configure}
)
+2 -1
View File
@@ -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"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -135,7 +135,7 @@ stdenv.mkDerivation rec {
export PYTHONHASHSEED=1
'';
wafConfigureFlags = [
configureFlags = [
"--with-static-modules=NONE"
"--with-shared-modules=ALL"
"--enable-fhs"
+1 -1
View File
@@ -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"
+1 -1
View File
@@ -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" ];