diff options
38 files changed, 128 insertions, 112 deletions
diff --git a/doc/hooks/waf.section.md b/doc/hooks/waf.section.md index 5e79b8bb30662..a7ebaeb13a504 100644 --- a/doc/hooks/waf.section.md +++ b/doc/hooks/waf.section.md @@ -1,47 +1,58 @@ -# waf.hook {#wafhook} +# wafHook {#wafHook} [Waf](https://waf.io) is a Python-based software building system. -In Nixpkgs, `waf.hook` overrides the default configure, build, and install phases. +In Nixpkgs, `wafHook` overrides the default configure, build, and install phases. -## Variables controlling waf.hook {#variablesControllingWafHook} +## Variables controlling wafHook {#variablesControllingWafHook} -### `wafPath` {#wafPath} +### `wafHook` Exclusive Variables {#wafHookExclusiveVariables} + +The variables below are exclusive of `wafHook`. + +#### `wafPath` {#wafPath} Location of the `waf` tool. It defaults to `./waf`, to honor software projects that include it directly inside their source trees. -If `wafPath` doesn't exist, then `waf.hook` will copy the `waf` provided from Nixpkgs to it. +If `wafPath` doesn't exist, then `wafHook` will copy the `waf` provided from Nixpkgs to it. -### `wafFlags` {#wafFlags} +#### `wafFlags` {#wafFlags} -Controls the flags passed to waf tool during build and install phases. For settings specific to build or install phases, use `buildFlags` or `installFlags` respectively. +Controls the flags passed to waf tool during build and install phases. For settings specific to build or install phases, use `wafBuildFlags` or `wafInstallFlags` respectively. -### `dontAddWafCrossFlags` {#dontAddWafCrossFlags} +#### `dontAddWafCrossFlags` {#dontAddWafCrossFlags} When set to `true`, don't add cross compilation flags during configure phase. -### `dontUseWafConfigure` {#dontUseWafConfigure} +#### `dontUseWafConfigure` {#dontUseWafConfigure} When set to true, don't use the predefined `wafConfigurePhase`. -### `dontUseWafBuild` {#dontUseWafBuild} +#### `dontUseWafBuild` {#dontUseWafBuild} When set to true, don't use the predefined `wafBuildPhase`. -### `dontUseWafInstall` {#dontUseWafInstall} +#### `dontUseWafInstall` {#dontUseWafInstall} When set to true, don't use the predefined `wafInstallPhase`. -### Variables honored by waf.hook {#variablesHonoredByWafHook} +### Similar variables {#similarVariables} + +The following variables are similar to their `stdenv.mkDerivation` counterparts. + +| `wafHook` Variable | `stdenv.mkDerivation` Counterpart | +|-----------------------|-----------------------------------| +| `wafConfigureFlags` | `configureFlags` | +| `wafConfigureTargets` | `configureTargets` | +| `wafBuildFlags` | `buildFlags` | +| `wafBuildTargets` | `buildTargets` | +| `wafInstallFlags` | `installFlags` | +| `wafInstallTargets` | `installTargets` | + +### Honored variables {#honoredVariables} -The following variables commonly used by `stdenv.mkDerivation` are also honored by `waf.hook`. +The following variables commonly used by `stdenv.mkDerivation` are honored by `wafHook`. - `prefixKey` -- `configureFlags` -- `configureTargets` - `enableParallelBuilding` - `enableParallelInstalling` -- `buildFlags` -- `buildTargets` -- `installFlags` -- `installTargets` diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index b771c03681484..88956a190c4a4 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkg-config -, waf, python3 }: +, wafHook, python3 }: stdenv.mkDerivation rec { pname = "ams-lv2"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1lz2mvk4gqsyf92yxd3aaldx0d0qi28h4rnnvsaz4ls0ccqm80nk"; }; - nativeBuildInputs = [ pkg-config waf.hook python3 ]; + nativeBuildInputs = [ pkg-config wafHook python3 ]; buildInputs = [ cairo fftw gtkmm2 lv2 lvtk ]; meta = with lib; { diff --git a/pkgs/applications/audio/ardour/6.nix b/pkgs/applications/audio/ardour/6.nix index 026e23649edde..4e0508f00c576 100644 --- a/pkgs/applications/audio/ardour/6.nix +++ b/pkgs/applications/audio/ardour/6.nix @@ -50,7 +50,7 @@ , suil , taglib , vamp-plugin-sdk -, waf +, wafHook , xjadeo , videoSupport ? true }: @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { perl pkg-config python3 - waf.hook + wafHook ]; buildInputs = [ @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { vamp-plugin-sdk ] ++ lib.optionals videoSupport [ harvid xjadeo ]; - configureFlags = [ + wafConfigureFlags = [ "--cxx11" "--docs" "--freedesktop" diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 9589f8b087b7a..2c8a44f62162e 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -52,7 +52,7 @@ , suil , taglib , vamp-plugin-sdk -, waf +, wafHook , xjadeo , videoSupport ? true }: @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { perl pkg-config python3 - waf.hook + wafHook ]; buildInputs = [ @@ -150,7 +150,7 @@ stdenv.mkDerivation rec { vamp-plugin-sdk ] ++ lib.optionals videoSupport [ harvid xjadeo ]; - configureFlags = [ + wafConfigureFlags = [ "--cxx11" "--docs" "--freedesktop" diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix index 14231a1b2ad45..8dc86cb8ccf5d 100644 --- a/pkgs/applications/audio/fomp/default.nix +++ b/pkgs/applications/audio/fomp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, lv2, pkg-config, python3, waf }: +{ lib, stdenv, fetchurl, lv2, pkg-config, python3, wafHook }: stdenv.mkDerivation rec { pname = "fomp"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-xnGijydiO3B7BjSlryFuH1j/OPio9hCYbniq2IXp2W8="; }; - nativeBuildInputs = [ pkg-config waf.hook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ lv2 python3 ]; meta = with lib; { diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index abe24fb224531..3033888996a19 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -30,7 +30,7 @@ , serd , sord , sratom -, waf +, wafHook , wrapGAppsHook , zita-convolver , zita-resampler @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { intltool pkg-config python3 - waf.hook + wafHook wrapGAppsHook ]; @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { zita-resampler ]; - configureFlags = [ + wafConfigureFlags = [ "--no-font-cache-update" "--shared-lib" "--no-desktop-update" diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index 7c86d3b76fa05..81a97d5a054e6 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv , lv2, pkg-config, python3, raul, serd, sord, sratom -, waf +, wafHook , suil }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { deepClone = true; }; - nativeBuildInputs = [ pkg-config waf.hook python3 python3.pkgs.wrapPython ]; + nativeBuildInputs = [ pkg-config wafHook python3 python3.pkgs.wrapPython ]; buildInputs = [ boost ganv glibmm gtkmm2 libjack2 lilv lv2 python3 raul serd sord sratom suil diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index 82c747c2d7a62..b640b55c5476b 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkg-config, python3 -, serd, sord , sratom, suil, waf }: +, serd, sord , sratom, suil, wafHook }: stdenv.mkDerivation rec { pname = "jalv"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-ktFBeBtmQ3MgfDQ868XpuM7UYfryb9zLld8AB7BjnhY="; }; - nativeBuildInputs = [ pkg-config waf.hook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ gtk2 libjack2 lilv lv2 python3 serd sord sratom suil ]; diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix index 269d334fbe970..98812bec4d87f 100644 --- a/pkgs/applications/audio/mda-lv2/default.nix +++ b/pkgs/applications/audio/mda-lv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fftwSinglePrec, lv2, pkg-config, waf, python3 }: +{ lib, stdenv, fetchurl, fftwSinglePrec, lv2, pkg-config, wafHook, python3 }: stdenv.mkDerivation rec { pname = "mda-lv2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-zWYRcCSuBJzzrKg/npBKcCdyJOI6lp9yqcXQEKSYV9s="; }; - nativeBuildInputs = [ pkg-config waf.hook python3 ]; + nativeBuildInputs = [ pkg-config wafHook python3 ]; buildInputs = [ fftwSinglePrec lv2 ]; meta = with lib; { diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix index 8afcd1c02709f..39b8ecf7a6afb 100644 --- a/pkgs/applications/audio/non/default.nix +++ b/pkgs/applications/audio/non/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, python3, cairo, libjpeg, ntk, libjack2 -, libsndfile, ladspaH, liblo, libsigcxx, lrdf, waf +, libsndfile, ladspaH, liblo, libsigcxx, lrdf, wafHook }: stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "sha256-iMJNMDytNXpEkUhL0RILSd25ixkm8HL/edtOZta0Pf4="; }; - nativeBuildInputs = [ pkg-config waf.hook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ python3 cairo libjpeg ntk libjack2 libsndfile ladspaH liblo libsigcxx lrdf ]; diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix index 603f42886739c..99bbdf693a9c1 100644 --- a/pkgs/applications/audio/patchage/default.nix +++ b/pkgs/applications/audio/patchage/default.nix @@ -10,7 +10,7 @@ , libjack2 , pkg-config , python3 -, waf +, wafHook }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { gtkmm2 libjack2 python3 - waf.hook + wafHook ]; meta = { diff --git a/pkgs/applications/misc/hamster/default.nix b/pkgs/applications/misc/hamster/default.nix index d727257fbec50..925d246ba8448 100644 --- a/pkgs/applications/misc/hamster/default.nix +++ b/pkgs/applications/misc/hamster/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, python3Packages, intltool, glib, itstool, gtk3 -, wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, waf }: +, wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, wafHook }: python3Packages.buildPythonApplication rec { pname = "hamster"; @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { wrapGAppsHook intltool itstool - waf.hook + wafHook glib gobject-introspection ]; diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index 2e6eedc0cea85..fbb33c7e096fe 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -10,7 +10,7 @@ , desktop-file-utils , shared-mime-info , wrapGAppsHook -, waf +, wafHook , bash , dbus }: @@ -31,7 +31,7 @@ buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook intltool # For setup hook - gobject-introspection waf.hook + gobject-introspection wafHook itstool # for help pages desktop-file-utils # for update-desktop-database shared-mime-info # for update-mime-info diff --git a/pkgs/applications/office/semantik/default.nix b/pkgs/applications/office/semantik/default.nix index 538fbe9011b9d..5ceb37b411c1f 100644 --- a/pkgs/applications/office/semantik/default.nix +++ b/pkgs/applications/office/semantik/default.nix @@ -3,7 +3,7 @@ , mkDerivation , fetchFromGitLab , fetchpatch -, waf +, wafHook , pkg-config , cmake , qtbase @@ -65,7 +65,7 @@ mkDerivation rec { --replace /usr/include/KF5/KDELibs4Support "${lib.getDev kdelibs4support}/include/KF5/KDELibs4Support" ''; - nativeBuildInputs = [ (lib.getDev qtsvg) (lib.getLib qtsvg) python3 pkg-config waf.hook cmake ]; + nativeBuildInputs = [ (lib.getDev qtsvg) (lib.getLib qtsvg) python3 pkg-config wafHook cmake ]; buildInputs = [ qtbase @@ -85,7 +85,7 @@ mkDerivation rec { kdelibs4support ]; - configureFlags = [ + wafConfigureFlags = [ "--qtlibs=${lib.getLib qtbase}/lib" ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix index 6583c8b03a2e3..032b29eaef3d4 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, pkg-config, fetchFromGitHub, python3, vala -, gtk3, libwnck, libxfce4util, xfce4-panel, waf, xfce +, gtk3, libwnck, libxfce4util, xfce4-panel, wafHook, xfce , gitUpdater }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-aKrJzf9rwCyXAJsRIXdBzmJBASuXD5I5kZrp+atx4FA="; }; - nativeBuildInputs = [ pkg-config vala waf.hook python3 ]; + nativeBuildInputs = [ pkg-config vala wafHook python3 ]; buildInputs = [ gtk3 libwnck libxfce4util xfce4-panel ]; postPatch = '' diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index 673064db7a5d0..2e8bdc50ca63d 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, alsa-lib, fftw, libjack2, libsamplerate -, libsndfile, pkg-config, python3, waf +, libsndfile, pkg-config, python3, wafHook }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1npks71ljc48w6858l9bq30kaf5nph8z0v61jkfb70xb9np850nl"; }; - nativeBuildInputs = [ pkg-config python3 waf.hook ]; + nativeBuildInputs = [ pkg-config python3 wafHook ]; buildInputs = [ alsa-lib fftw libjack2 libsamplerate libsndfile ]; strictDeps = true; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index b51a608c96950..14b0d4c5e46fa 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, sratom, waf +{ lib, stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, sratom, wafHook # test derivations , pipewire @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patches = [ ./lilv-pkgconfig.patch ]; - nativeBuildInputs = [ pkg-config python3 waf.hook ]; + nativeBuildInputs = [ pkg-config python3 wafHook ]; buildInputs = [ serd sord sratom ]; propagatedBuildInputs = [ lv2 ]; dontAddWafCrossFlags = true; diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index 6b16826d7d68e..9822640f8d672 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, boost, gtkmm2, lv2, pkg-config, python3, waf }: +{ lib, stdenv, fetchFromGitHub, boost, gtkmm2, lv2, pkg-config, python3, wafHook }: stdenv.mkDerivation rec { pname = "lvtk"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-6IoyhBig3Nvc4Y8F0w8b1up6sn8O2RmoUVaBQ//+Aaw="; }; - nativeBuildInputs = [ pkg-config python3 waf.hook ]; + nativeBuildInputs = [ pkg-config python3 wafHook ]; buildInputs = [ boost gtkmm2 lv2 ]; enableParallelBuilding = true; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { sed -e '/print/d' -i wscript ''; - configureFlags = [ + wafConfigureFlags = [ "--boost-includes=${boost.dev}/include" "--boost-libs=${boost.out}/lib" ]; diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix index 3b8ecb807aa6f..d101e2a960c62 100644 --- a/pkgs/development/libraries/audio/ntk/default.nix +++ b/pkgs/development/libraries/audio/ntk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkg-config, python3, waf }: +{ lib, stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkg-config, python3, wafHook }: stdenv.mkDerivation rec { pname = "ntk"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-NyEdg6e+9CI9V+TIgdpPyH1ei+Vq8pUxD3wPzWY5fEU="; }; - nativeBuildInputs = [ pkg-config waf.hook ]; + nativeBuildInputs = [ pkg-config wafHook ]; buildInputs = [ cairo libjpeg libXft python3 ]; diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix index b8e21e36bba41..c200d4ab79c52 100644 --- a/pkgs/development/libraries/audio/raul/default.nix +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, boost, gtk2, pkg-config, python3, waf }: +{ lib, stdenv, fetchgit, boost, gtk2, pkg-config, python3, wafHook }: stdenv.mkDerivation rec { pname = "raul"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1z37jb6ghc13b8nv8a8hcg669gl8vh4ni9djvfgga9vcz8rmcg8l"; }; - nativeBuildInputs = [ pkg-config waf.hook python3 ]; + nativeBuildInputs = [ pkg-config wafHook python3 ]; buildInputs = [ boost gtk2 ]; strictDeps = true; diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index f037b61e3bcf8..3dc3bb5dacdcf 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, gtk2, lv2, pkg-config, python3, serd, sord, sratom -, waf +, wafHook , withQt5 ? true, qt5 ? null }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0z4v01pjw4wh65x38w6icn28wdwxz13ayl8hvn4p1g9kmamp1z06"; }; - nativeBuildInputs = [ pkg-config waf.hook python3 ]; + nativeBuildInputs = [ pkg-config wafHook python3 ]; buildInputs = [ gtk2 lv2 serd sord sratom ] ++ lib.optionals withQt5 (with qt5; [ qtbase qttools ]); diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix index 9818afa9412a1..d53206ca667b4 100644 --- a/pkgs/development/libraries/ganv/default.nix +++ b/pkgs/development/libraries/ganv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python3, waf }: +{ lib, stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python3, wafHook }: stdenv.mkDerivation rec { pname = "ganv"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "01znnalirbqxpz62fbw2c14c8xn117jc92xv6dhb3hln92k9x37f"; }; - nativeBuildInputs = [ pkg-config waf.hook python3 gtk2 ]; + nativeBuildInputs = [ pkg-config wafHook python3 gtk2 ]; buildInputs = [ graphviz gtkmm2 ]; strictDeps = true; diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 96e8ded194aa9..95547fb6382a3 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -11,7 +11,7 @@ , docbook-xsl-nons , docbook_xml_dtd_42 , cmocka -, waf +, wafHook , libxcrypt }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config python3 - waf.hook + wafHook libxslt docbook-xsl-nons docbook_xml_dtd_42 @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { wafPath = "buildtools/bin/waf"; - configureFlags = [ + wafConfigureFlags = [ "--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 dc79c78e8b4fe..d7b31426c4f68 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -5,7 +5,7 @@ , pkg-config , python3 , python3Packages -, waf +, wafHook , boost179 , openssl , sqlite @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-nnnxlkYVTSRB6ZcuIUDFol999+amGtqegHXK+06ITK8="; }; - nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx waf.hook ]; + nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx wafHook ]; buildInputs = [ boost179 openssl sqlite ]; - configureFlags = [ + wafConfigureFlags = [ "--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 137cc8b4757d9..bfe38fd4719a9 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -8,7 +8,7 @@ , docbook-xsl-nons , docbook_xml_dtd_42 , fixDarwinDylibNames -, waf +, wafHook }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config python3 - waf.hook + wafHook docbook-xsl-nons docbook_xml_dtd_42 ] ++ lib.optionals stdenv.isDarwin [ @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { wafPath = "buildtools/bin/waf"; - configureFlags = [ + wafConfigureFlags = [ "--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 05de9fbe6380b..13f55a2dc52b1 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , pkg-config -, waf +, wafHook , python3 , readline , libxslt @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3 pkg-config - waf.hook + wafHook libxslt docbook-xsl-nons docbook_xml_dtd_45 @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { wafPath = "buildtools/bin/waf"; - configureFlags = [ + wafConfigureFlags = [ "--bundled-libraries=NONE" "--builtin-libraries=replace" ]; diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index a39aedc0468c8..c5d8d0fd3c498 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -9,7 +9,7 @@ , docbook-xsl-nons , docbook_xml_dtd_42 , which -, waf +, wafHook , libxcrypt }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { libxslt docbook-xsl-nons docbook_xml_dtd_42 - waf.hook + wafHook ]; buildInputs = [ @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { wafPath = "buildtools/bin/waf"; - configureFlags = [ + wafConfigureFlags = [ "--bundled-libraries=NONE" "--builtin-libraries=replace" ]; diff --git a/pkgs/development/tools/build-managers/waf/hook.nix b/pkgs/development/tools/build-managers/waf/hook.nix index 7282ed9ebf97c..ac497d2278314 100644 --- a/pkgs/development/tools/build-managers/waf/hook.nix +++ b/pkgs/development/tools/build-managers/waf/hook.nix @@ -13,7 +13,7 @@ makeSetupHook { # waf is not inserted into propagatedBuildInputs, rather it is inserted # directly inherit waf; - crossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) + wafCrossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) ''--cross-compile "--cross-execute=${stdenv.targetPlatform.emulator pkgs}"''; }; diff --git a/pkgs/development/tools/build-managers/waf/setup-hook.sh b/pkgs/development/tools/build-managers/waf/setup-hook.sh index 34d2ca6a36415..d3e2bf97e6823 100644 --- a/pkgs/development/tools/build-managers/waf/setup-hook.sh +++ b/pkgs/development/tools/build-managers/waf/setup-hook.sh @@ -18,15 +18,15 @@ wafConfigurePhase() { local flagsArray=( $prefixFlag - $configureFlags "${configureFlagsArray[@]}" - ${configureTargets:-configure} + $wafConfigureFlags "${wafConfigureFlagsArray[@]}" + ${wafConfigureTargets:-configure} ) if [ -z "${dontAddWafCrossFlags:-}" ]; then - flagsArray+=(@crossFlags@) + flagsArray+=(@wafCrossFlags@) fi - echoCmd 'configure flags' "${flagsArray[@]}" + echoCmd 'waf configure flags' "${flagsArray[@]}" python "$wafPath" "${flagsArray[@]}" if ! [[ -v enableParallelBuilding ]]; then @@ -51,11 +51,11 @@ wafBuildPhase () { local flagsArray=( ${enableParallelBuilding:+-j ${NIX_BUILD_CORES}} $wafFlags ${wafFlagsArray[@]} - $buildFlags ${buildFlagsArray[@]} - ${buildTargets:-build} + $wafBuildFlags ${wafBuildFlagsArray[@]} + ${wafBuildTargets:-build} ) - echoCmd 'build flags' "${flagsArray[@]}" + echoCmd 'waf build flags' "${flagsArray[@]}" python "$wafPath" "${flagsArray[@]}" runHook postBuild @@ -71,11 +71,11 @@ wafInstallPhase() { local flagsArray=( ${enableParallelInstalling:+-j ${NIX_BUILD_CORES}} $wafFlags ${wafFlagsArray[@]} - $installFlags ${installFlagsArray[@]} - ${installTargets:-install} + $wafInstallFlags ${wafInstallFlagsArray[@]} + ${wafInstallTargets:-install} ) - echoCmd 'install flags' "${flagsArray[@]}" + echoCmd 'waf install flags' "${flagsArray[@]}" python "$wafPath" "${flagsArray[@]}" runHook postInstall diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 2fa874833c6a7..64f386e0378d3 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, python3Packages, makeWrapper , libsamplerate, libsndfile, readline, eigen, celt -, waf +, wafHook # Darwin Dependencies , aften, AudioUnit, CoreAudio, libobjc, Accelerate @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config python makeWrapper waf.hook ]; + nativeBuildInputs = [ pkg-config python makeWrapper wafHook ]; buildInputs = [ libsamplerate libsndfile readline eigen celt optDbus optPythonDBus optLibffado optAlsaLib optLibopus ] ++ lib.optionals stdenv.isDarwin [ @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { dontAddWafCrossFlags = true; - configureFlags = [ + wafConfigureFlags = [ "--classic" "--autostart=${if (optDbus != null) then "dbus" else "classic"}" ] ++ lib.optional (optDbus != null) "--dbus" diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/os-specific/linux/pflask/default.nix index 9d7eac8bee1ea..1270a9b9494f5 100644 --- a/pkgs/os-specific/linux/pflask/default.nix +++ b/pkgs/os-specific/linux/pflask/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, python3, waf }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, python3, wafHook }: stdenv.mkDerivation rec { pname = "pflask"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ python3 waf.hook ]; + nativeBuildInputs = [ python3 wafHook ]; postInstall = '' mkdir -p $out/bin diff --git a/pkgs/servers/nfd/default.nix b/pkgs/servers/nfd/default.nix index 2b6655106de70..30f1140ab50ec 100644 --- a/pkgs/servers/nfd/default.nix +++ b/pkgs/servers/nfd/default.nix @@ -8,7 +8,7 @@ , pkg-config , sphinx , systemd -, waf +, wafHook , websocketpp , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , withWebSocket ? true @@ -26,10 +26,10 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkg-config sphinx waf.hook ]; + nativeBuildInputs = [ pkg-config sphinx wafHook ]; buildInputs = [ libpcap ndn-cxx openssl websocketpp ] ++ lib.optional withSystemd systemd; - configureFlags = [ + wafConfigureFlags = [ "--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 85cc6b0e24721..ed8744ef3c626 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,7 +1,7 @@ { lib, stdenv , buildPackages , fetchurl -, waf +, wafHook , pkg-config , bison , flex @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3Packages.python - waf.hook + wafHook pkg-config bison flex @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { export PYTHONHASHSEED=1 ''; - configureFlags = [ + wafConfigureFlags = [ "--with-static-modules=NONE" "--with-shared-modules=ALL" "--enable-fhs" diff --git a/pkgs/tools/graphics/blockhash/default.nix b/pkgs/tools/graphics/blockhash/default.nix index 9d7b613bbe0b1..4f63cf90a3aeb 100644 --- a/pkgs/tools/graphics/blockhash/default.nix +++ b/pkgs/tools/graphics/blockhash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, pkg-config, imagemagick, waf }: +{ lib, stdenv, fetchFromGitHub, python3, pkg-config, imagemagick, wafHook }: stdenv.mkDerivation rec { pname = "blockhash"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0x3lvhnkb4c3pyq6p81qnnqimz35wpippiac506dgjx3b1848v35"; }; - nativeBuildInputs = [ python3 pkg-config waf.hook ]; + nativeBuildInputs = [ python3 pkg-config wafHook ]; buildInputs = [ imagemagick ]; strictDeps = true; diff --git a/pkgs/tools/networking/ndn-tools/default.nix b/pkgs/tools/networking/ndn-tools/default.nix index ea6c731f214e9..1cbc6d403a9d6 100644 --- a/pkgs/tools/networking/ndn-tools/default.nix +++ b/pkgs/tools/networking/ndn-tools/default.nix @@ -7,7 +7,7 @@ , openssl , pkg-config , sphinx -, waf +, wafHook }: stdenv.mkDerivation rec { @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { EOF ''; - nativeBuildInputs = [ pkg-config sphinx waf.hook ]; + nativeBuildInputs = [ pkg-config sphinx wafHook ]; buildInputs = [ libpcap ndn-cxx openssl ]; - configureFlags = [ + wafConfigureFlags = [ "--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 c131a709f734e..d02acb3100a7e 100644 --- a/pkgs/tools/networking/saldl/default.nix +++ b/pkgs/tools/networking/saldl/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , pkg-config -, waf +, wafHook , python3 , asciidoc , docbook_xml_dtd_45 @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - waf.hook + wafHook python3 asciidoc docbook_xml_dtd_45 @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl libevent ]; - configureFlags = [ "--saldl-version ${version}" "--no-werror" ]; + wafConfigureFlags = [ "--saldl-version ${version}" "--no-werror" ]; outputs = [ "out" "man" ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a7011216cdc88..685c078c93299 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1865,7 +1865,6 @@ mapAliases ({ inherit (libsForQt5.mauiPackages) vvave; # added 2022-05-17 ### W ### - wafHook = waf.hook; # Added 2023-08-23 wavesurfer = throw "wavesurfer has been removed: depended on snack which has been removed"; # Added 2022-04-21 waybar-hyprland = throw "waybar-hyprland has been removed: hyprland support is now built into waybar by default."; # Added 2023-08-21 way-cooler = throw "way-cooler is abandoned by its author: https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html"; # Added 2020-01-13 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a082036d6f25b..20e00227cdf9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14856,6 +14856,12 @@ with pkgs; volumeicon = callPackage ../tools/audio/volumeicon { }; waf = callPackage ../development/tools/build-managers/waf { }; + # An alias to work around the splicing incidents + # Related: + # https://github.com/NixOS/nixpkgs/issues/204303 + # https://github.com/NixOS/nixpkgs/issues/211340 + # https://github.com/NixOS/nixpkgs/issues/227327 + wafHook = waf.hook; waf-tester = callPackage ../tools/security/waf-tester { }; |