git.iko.soy/typeable/nixpkgs
on master help sign in
treewide: use wafHook

Replace "waf" phases with wafHook that manages everything automatically. Should make things more modular. Packages affected here are: - a2jmidid - ams-lv2 - ardour - fomp - guitarix - ingen - jalv - mda-lv2 - non - patchage - hamster-time-tracker - kupfer - xiphos - xfce4-dockbarx-plugin - xfce4-namebar-plugin - dropbox - clasp - aubio - liliv - lv2 - lvtk - ntk - raul - sratom - suil - ganv - ndn-cxx - ns3 - serd - sord - termbox - wxmupen64plus - jackaudio - pflask - blockhash - glmark2 - weighttp

commitf2a20b6e520989bc2c01d362c31fa94cbf6bee52 authorMatthew Bauer <mjbauer95@gmail.com> dateSun 11 Nov 2018, 15:20 (8 years ago) parent92ebfa1
38 files changed+127−367
pkgs/applications/audio/a2jmidid/default.nix+3−7 pkgs/applications/audio/ams-lv2/default.nix+3−8 pkgs/applications/audio/ardour/default.nix+9−7 pkgs/applications/audio/fomp/default.nix+2−8 pkgs/applications/audio/guitarix/default.nix+2−8 pkgs/applications/audio/ingen/default.nix+4−8 pkgs/applications/audio/jalv/default.nix+2−8 pkgs/applications/audio/mda-lv2/default.nix+2−8 pkgs/applications/audio/non/default.nix+2−5 pkgs/applications/audio/patchage/default.nix+2−6 pkgs/applications/misc/hamster-time-tracker/default.nix+2−12 pkgs/applications/misc/kupfer/default.nix+3−19 pkgs/applications/misc/xiphos/default.nix+4−13 pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix+3−8 pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix+3−8 pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix+2−9 pkgs/development/compilers/clasp/default.nix+9−30 pkgs/development/libraries/aubio/default.nix+2−8 pkgs/development/libraries/audio/lilv/default.nix+2−8 pkgs/development/libraries/audio/lv2/default.nix+2−8 pkgs/development/libraries/audio/lv2/unstable.nix+2−8 pkgs/development/libraries/audio/lvtk/default.nix+6−11 pkgs/development/libraries/audio/ntk/default.nix+2−11 pkgs/development/libraries/audio/raul/default.nix+2−8 pkgs/development/libraries/audio/sratom/default.nix+2−8 pkgs/development/libraries/audio/suil/default.nix+2−7 pkgs/development/libraries/ganv/default.nix+2−8 pkgs/development/libraries/ndn-cxx/default.nix+8−16 pkgs/development/libraries/science/networking/ns3/default.nix+5−9 pkgs/development/libraries/serd/default.nix+2−8 pkgs/development/libraries/sord/default.nix+2−8 pkgs/development/libraries/termbox/default.nix+2−6 pkgs/misc/emulators/wxmupen64plus/default.nix+6−6 pkgs/misc/jackaudio/default.nix+12−23 pkgs/os-specific/linux/pflask/default.nix+2−12 pkgs/tools/graphics/blockhash/default.nix+2−6 pkgs/tools/graphics/glmark2/default.nix+3−10 pkgs/tools/networking/weighttp/default.nix+2−6
pkgs/applications/audio/a2jmidid/default.nix+3−7
@@ -1,4 +1,5 @@
11{ stdenv, fetchurl, makeWrapper, pkgconfig, alsaLib, dbus, libjack2
2+, wafHook
23, python2Packages}:
34
45let
@@ -12,15 +13,10 @@ in stdenv.mkDerivation rec {
1213 sha256 = "06dgf5655znbvrd7fhrv8msv6zw8vk0hjqglcqkh90960mnnmwz7";
1314 };
1415
15− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkgconfig wafHook ];
1617 buildInputs = [ makeWrapper alsaLib dbus libjack2 python dbus-python ];
1718
18− configurePhase = "${python.interpreter} waf configure --prefix=$out";
19−
20− buildPhase = "${python.interpreter} waf";
21−
22− installPhase = ''
23− ${python.interpreter} waf install
19+ postInstall = ''
2420 wrapProgram $out/bin/a2j_control --set PYTHONPATH $PYTHONPATH
2521 '';
2622
pkgs/applications/audio/ams-lv2/default.nix+3−8
@@ -1,4 +1,5 @@
1−{ stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig, python3 }:
1+{ stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig, python3
2+, wafHook }:
23
34stdenv.mkDerivation rec {
45 name = "ams-lv2-${version}";
@@ -11,15 +12,9 @@ stdenv.mkDerivation rec {
1112 sha256 = "1n1dnqnj24xhiy9323lj52nswr5120cj56fpckg802miss05sr6x";
1213 };
1314
14− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkgconfig wafHook ];
1516 buildInputs = [ cairo fftw gtkmm2 lv2 lvtk ];
1617
17− configurePhase = "${python3.interpreter} waf configure --prefix=$out";
18−
19− buildPhase = "${python3.interpreter} waf";
20−
21− installPhase = "${python3.interpreter} waf install";
22−
2318 meta = with stdenv.lib; {
2419 description = "An LV2 port of the internal modules found in Alsa Modular Synth";
2520 homepage = http://objectivewave.wordpress.com/ams-lv2;
pkgs/applications/audio/ardour/default.nix+9−7
@@ -4,7 +4,8 @@
44, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
55, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper
66, perl, pkgconfig, python2, rubberband, serd, sord, sratom
7−, taglib, vampSDK, dbus, fftw, pango, suil, libarchive }:
7+, taglib, vampSDK, dbus, fftw, pango, suil, libarchive
8+, wafHook }:
89
910let
1011
@@ -29,6 +30,7 @@ stdenv.mkDerivation rec {
2930 sha256 = "0mla5lm51ryikc2rrk53max2m7a5ds6i1ai921l2h95wrha45nkr";
3031 };
3132
33+ nativeBuildInputs = [ wafHook ];
3234 buildInputs =
3335 [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac
3436 glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo
@@ -47,13 +49,13 @@ stdenv.mkDerivation rec {
4749 patchShebangs ./tools/
4850 '';
4951
50− configurePhase = "${python2.interpreter} waf configure --optimize --docs --with-backends=jack,alsa,dummy --prefix=$out";
51−
52− buildPhase = "${python2.interpreter} waf";
53−
54− installPhase = ''
55− ${python2.interpreter} waf install
52+ configureFlags = [
53+ "--optimize"
54+ "--docs"
55+ "--with-backends=jack,alsa,dummy"
56+ ];
5657
58+ postInstall = ''
5759 # Install desktop file
5860 mkdir -p "$out/share/applications"
5961 cat > "$out/share/applications/ardour.desktop" << EOF
pkgs/applications/audio/fomp/default.nix+2−8
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, lv2, pkgconfig, python2 }:
1+{ stdenv, fetchurl, lv2, pkgconfig, python2, wafHook }:
22
33stdenv.mkDerivation rec {
44 name = "fomp-${version}";
@@ -9,15 +9,9 @@ stdenv.mkDerivation rec {
99 sha256 = "1hh2xhknanqn3iwp12ihl6bf8p7bqxryms9qk7mh21lixl42b8k5";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkgconfig wafHook ];
1313 buildInputs = [ lv2 python2 ];
1414
15− installPhase = ''
16− python waf configure --prefix=$out
17− python waf
18− python waf install
19− '';
20−
2115 meta = with stdenv.lib; {
2216 homepage = http://drobilla.net/software/fomp/;
2317 description = "An LV2 port of the MCP, VCO, FIL, and WAH plugins by Fons Adriaensen";
pkgs/applications/audio/guitarix/default.nix+2−8
@@ -2,7 +2,7 @@
22, avahi, bluez, boost, eigen, fftw, glib, glib-networking
33, glibmm, gsettings-desktop-schemas, gtkmm2, libjack2
44, ladspaH, libav, librdf, libsndfile, lilv, lv2, serd, sord, sratom
5−, wrapGAppsHook, zita-convolver, zita-resampler, curl
5+, wrapGAppsHook, zita-convolver, zita-resampler, curl, wafHook
66, optimizationSupport ? false # Enable support for native CPU extensions
77}:
88
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
1919 sha256 = "1wfm8wrwrnqpb4ihy75n7l9i6vml536jlq9pdx2pblbc4ba3paac";
2020 };
2121
22− nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ];
22+ nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 wafHook ];
2323
2424 buildInputs = [
2525 avahi bluez boost eigen fftw glib glibmm glib-networking.out
@@ -38,12 +38,6 @@ stdenv.mkDerivation rec {
3838 "--convolver-ffmpeg"
3939 ] ++ optional optimizationSupport "--optimization";
4040
41− configurePhase = ''python2 waf configure --prefix=$out $configureFlags'';
42−
43− buildPhase = ''python2 waf build'';
44−
45− installPhase = ''python2 waf install'';
46−
4741 meta = with stdenv.lib; {
4842 description = "A virtual guitar amplifier for Linux running with JACK";
4943 longDescription = ''
pkgs/applications/audio/ingen/default.nix+4−8
@@ -1,6 +1,6 @@
11{ stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv
22, lv2Unstable, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom
3−
3+, wafHook
44, suil
55}:
66
@@ -15,23 +15,19 @@ stdenv.mkDerivation rec {
1515 deepClone = true;
1616 };
1717
18− nativeBuildInputs = [ pkgconfig ];
18+ nativeBuildInputs = [ pkgconfig wafHook ];
1919 buildInputs = [
2020 boost ganv glibmm gtkmm2 libjack2 lilv lv2Unstable makeWrapper
2121 python raul serd sord sratom suil
2222 ];
2323
24− configurePhase = ''
24+ preConfigure = ''
2525 sed -e "s@{PYTHONDIR}/'@out/'@" -i wscript
26− ${python.interpreter} waf configure --prefix=$out
2726 '';
2827
2928 propagatedBuildInputs = [ rdflib ];
3029
31− buildPhase = "${python.interpreter} waf";
32−
33− installPhase = ''
34− ${python.interpreter} waf install
30+ postInstall = ''
3531 for program in ingenams ingenish
3632 do
3733 wrapProgram $out/bin/$program \
pkgs/applications/audio/jalv/default.nix+2−8
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkgconfig, python
2−, serd, sord , sratom, suil }:
2+, serd, sord , sratom, suil, wafHook }:
33
44stdenv.mkDerivation rec {
55 name = "jalv-${version}";
@@ -10,17 +10,11 @@ stdenv.mkDerivation rec {
1010 sha256 = "1x2wpzzx2cgvz3dgdcgsj8dr0w3zsasy62mvl199bsdj5fbjaili";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkgconfig wafHook ];
1414 buildInputs = [
1515 gtk2 libjack2 lilv lv2 python serd sord sratom suil
1616 ];
1717
18− configurePhase = "python waf configure --prefix=$out";
19−
20− buildPhase = "python waf";
21−
22− installPhase = "python waf install";
23−
2418 meta = with stdenv.lib; {
2519 description = "A simple but fully featured LV2 host for Jack";
2620 homepage = http://drobilla.net/software/jalv;
pkgs/applications/audio/mda-lv2/default.nix+2−8
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, python }:
1+{ stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, python, wafHook }:
22
33stdenv.mkDerivation rec {
44 name = "mda-lv2-${version}";
@@ -9,15 +9,9 @@ stdenv.mkDerivation rec {
99 sha256 = "0hh40c5d2m0k5gb3vw031l6lqn59dg804an3mkmhkc7qv4gc6xm4";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkgconfig wafHook ];
1313 buildInputs = [ fftwSinglePrec lv2 python ];
1414
15− configurePhase = "python waf configure --prefix=$out";
16−
17− buildPhase = "python waf";
18−
19− installPhase = "python waf install";
20−
2115 meta = with stdenv.lib; {
2216 homepage = http://drobilla.net/software/mda-lv2/;
2317 description = "An LV2 port of the MDA plugins by Paul Kellett";
pkgs/applications/audio/non/default.nix+2−5
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, pkgconfig, python2, cairo, libjpeg, ntk, libjack2
2−, libsndfile, ladspaH, liblrdf, liblo, libsigcxx
2+, libsndfile, ladspaH, liblrdf, liblo, libsigcxx, wafHook
33}:
44
55stdenv.mkDerivation rec {
@@ -12,13 +12,10 @@ stdenv.mkDerivation rec {
1212 sha256 = "1cljkkyi9dxqpqhx8y6l2ja4zjmlya26m26kqxml8gx08vyvddhx";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkgconfig wafHook ];
1616 buildInputs = [ python2 cairo libjpeg ntk libjack2 libsndfile
1717 ladspaH liblrdf liblo libsigcxx
1818 ];
19− configurePhase = "python waf configure --prefix=$out";
20− buildPhase = "python waf build";
21− installPhase = "python waf install";
2219
2320 meta = {
2421 description = "Lightweight and lightning fast modular Digital Audio Workstation";
pkgs/applications/audio/patchage/default.nix+2−6
@@ -1,5 +1,5 @@
11{ stdenv, alsaLib, boost, dbus-glib, fetchsvn, ganv, glibmm
2−, gtkmm2, libjack2, pkgconfig, python2
2+, gtkmm2, libjack2, pkgconfig, python2, wafHook
33}:
44
55stdenv.mkDerivation rec {
@@ -13,13 +13,9 @@ stdenv.mkDerivation rec {
1313
1414 buildInputs = [
1515 alsaLib boost dbus-glib ganv glibmm gtkmm2 libjack2
16− pkgconfig python2
16+ pkgconfig python2 wafHook
1717 ];
1818
19− configurePhase = "python waf configure --prefix=$out";
20− buildPhase = "python waf build";
21− installPhase = "python waf install";
22−
2319 meta = {
2420 description = "Modular patch bay for Jack and ALSA systems";
2521 homepage = http://non.tuxfamily.org;
pkgs/applications/misc/hamster-time-tracker/default.nix+2−12
@@ -1,6 +1,7 @@
11{ stdenv, fetchzip, pythonPackages, docbook2x, libxslt, gnome-doc-utils
22, intltool, dbus-glib, gnome_python
33, hicolor-icon-theme
4+, wafHook
45}:
56
67# TODO: Add optional dependency 'wnck', for "workspace tracking" support. Fixes
@@ -17,28 +18,17 @@ pythonPackages.buildPythonApplication rec {
1718 sha256 = "1a85rcg561792kdyv744cgzw7mmpmgv6d6li1sijfdpqa1ninf8g";
1819 };
1920
21+ nativeBuildInputs = [ wafHook ];
2022 buildInputs = [
2123 docbook2x libxslt gnome-doc-utils intltool dbus-glib hicolor-icon-theme
2224 ];
2325
2426 propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python ];
2527
26− configurePhase = ''
27− python waf configure --prefix="$out"
28− '';
29−
30− buildPhase = ''
31− python waf build
32− '';
33−
3428 postFixup = ''
3529 wrapPythonProgramsIn $out/lib/hamster-time-tracker "$out $pythonPath"
3630 '';
3731
38− installPhase = ''
39− python waf install
40− '';
41−
4232 # error: invalid command 'test'
4333 doCheck = false;
4434
pkgs/applications/misc/kupfer/default.nix+3−19
@@ -8,6 +8,7 @@
88, keybinder3
99, hicolor-icon-theme
1010, wrapGAppsHook
11+, wafHook
1112}:
1213
1314with python3Packages;
@@ -24,37 +25,20 @@ buildPythonApplication rec {
2425 nativeBuildInputs = [
2526 wrapGAppsHook intltool
2627 # For setup hook
27− gobjectIntrospection
28+ gobjectIntrospection wafHook
2829 ];
2930 buildInputs = [ hicolor-icon-theme docutils libwnck3 keybinder3 ];
3031 propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ];
3132
32− configurePhase = ''
33− runHook preConfigure
34− python ./waf configure --prefix=$prefix
35− runHook postConfigure
36− '';
37−
38− buildPhase = ''
39− runHook preBuild
40− python ./waf
41− runHook postBuild
42− '';
43−
44− installPhase = let
33+ postInstall = let
4534 pythonPath = (stdenv.lib.concatMapStringsSep ":"
4635 (m: "${m}/lib/${python.libPrefix}/site-packages")
4736 propagatedBuildInputs);
4837 in ''
49− runHook preInstall
50− python ./waf install
51−
5238 gappsWrapperArgs+=(
5339 "--prefix" "PYTHONPATH" : "${pythonPath}"
5440 "--set" "PYTHONNOUSERSITE" "1"
5541 )
56−
57− runHook postInstall
5842 '';
5943
6044 doCheck = false; # no tests
pkgs/applications/misc/xiphos/default.nix+4−13
@@ -1,4 +1,4 @@
1−{stdenv, fetchFromGitHub, pkgconfig
1+{ stdenv, fetchFromGitHub, pkgconfig
22, python
33, intltool
44, docbook2x, docbook_xml_dtd_412, libxslt
@@ -9,6 +9,7 @@
99, webkitgtk
1010, dbus-glib, enchant, isocodes, libuuid, icu
1111, wrapGAppsHook
12+, wafHook
1213}:
1314
1415stdenv.mkDerivation rec {
@@ -22,7 +23,7 @@ stdenv.mkDerivation rec {
2223 sha256 = "1vwf1ps6nrajxl1qbs6v1cgykmq5wn4j09j10gbcd3b2nvrprf3g";
2324 };
2425
25− nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
26+ nativeBuildInputs = [ pkgconfig wrapGAppsHook wafHook ];
2627 buildInputs = [ python intltool docbook2x docbook_xml_dtd_412 libxslt
2728 sword clucene_core biblesync gnome-doc-utils libgsf gconf gtkhtml
2829 libglade scrollkeeper webkitgtk dbus-glib enchant isocodes libuuid icu ];
@@ -36,17 +37,7 @@ stdenv.mkDerivation rec {
3637 export SWORD_HOME=${sword};
3738 '';
3839
39− configurePhase = ''
40− python waf configure --prefix=$out --enable-webkit2
41− '';
42−
43− buildPhase = ''
44− python waf build
45− '';
46−
47− installPhase = ''
48− python waf install
49− '';
40+ configureFlags= [ "--enable-webkit2" ];
5041
5142 meta = with stdenv.lib; {
5243 description = "A GTK Bible study tool";
pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix+3−8
@@ -1,4 +1,5 @@
1−{ stdenv, pkgconfig, fetchFromGitHub, python2, bash, vala, dockbarx, gtk2, xfce, pythonPackages }:
1+{ stdenv, pkgconfig, fetchFromGitHub, python2, bash, vala
2+, dockbarx, gtk2, xfce, pythonPackages, wafHook }:
23
34stdenv.mkDerivation rec {
45 ver = "0.5";
@@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
1415
1516 pythonPath = [ dockbarx ];
1617
17− nativeBuildInputs = [ pkgconfig ];
18+ nativeBuildInputs = [ pkgconfig wafHook ];
1819 buildInputs = [ python2 vala gtk2 pythonPackages.wrapPython ]
1920 ++ (with xfce; [ libxfce4util xfce4-panel xfconf xfce4-dev-tools ])
2021 ++ pythonPath;
@@ -25,12 +26,6 @@ stdenv.mkDerivation rec {
2526 substituteInPlace src/dockbarx.vala --replace '/usr/bin/env python2' ${bash}/bin/bash
2627 '';
2728
28− configurePhase = "python waf configure --prefix=$out";
29−
30− buildPhase = "python waf build";
31−
32− installPhase = "python waf install";
33−
3429 postFixup = ''
3530 wrapPythonProgramsIn "$out/share/xfce4/panel/plugins" "$out $pythonPath"
3631 '';
pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix+3−8
@@ -1,4 +1,5 @@
1−{ stdenv, pkgconfig, fetchFromGitHub, python2, vala, gtk2, libwnck, libxfce4util, xfce4-panel }:
1+{ stdenv, pkgconfig, fetchFromGitHub, python2, vala
2+, gtk2, libwnck, libxfce4util, xfce4-panel, wafHook }:
23
34stdenv.mkDerivation rec {
45 ver = "0.3.1";
@@ -12,7 +13,7 @@ stdenv.mkDerivation rec {
1213 sha256 = "1sl4qmjywfvv53ch7hyfysjfd91zl38y7gdw2y3k69vkzd3h18ad";
1314 };
1415
15− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkgconfig wafHook ];
1617 buildInputs = [ python2 vala gtk2 libwnck libxfce4util xfce4-panel ];
1718
1819 postPatch = ''
@@ -20,12 +21,6 @@ stdenv.mkDerivation rec {
2021 substituteInPlace src/namebar.vala --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }"
2122 '';
2223
23− configurePhase = "python waf configure --prefix=$out";
24−
25− buildPhase = "python waf build";
26−
27− installPhase = "python waf install";
28−
2924 meta = with stdenv.lib; {
3025 homepage = https://github.com/TiZ-EX1/xfce4-namebar-plugin;
3126 description = "A plugins which integrates titlebar and window controls into the xfce4-panel";
pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix+2−9
@@ -1,6 +1,7 @@
11{ stdenv, fetchurl, pkgconfig
22, gtk
33, thunar-bare, python2, hicolor-icon-theme
4+, wafHook
45}:
56
67stdenv.mkDerivation rec {
@@ -14,20 +15,12 @@ stdenv.mkDerivation rec {
1415 sha256 = "08vhzzzwshyz371yl7fzfylmhvchhv3s5kml3dva4v39jhvrpnkf";
1516 };
1617
17− nativeBuildInputs = [ pkgconfig ];
18+ nativeBuildInputs = [ pkgconfig wafHook ];
1819 buildInputs = [
1920 gtk
2021 thunar-bare python2 hicolor-icon-theme
2122 ];
2223
23− configurePhase = "python2 waf configure --prefix=$out";
24−
25− buildPhase = "python2 waf";
26−
27− installPhase = ''
28− python2 waf install
29− '';
30−
3124 enableParallelBuilding = true;
3225
3326 meta = with stdenv.lib; {
pkgs/development/compilers/clasp/default.nix+9−30
@@ -1,7 +1,8 @@
1−{stdenv, fetchFromGitHub
2− , llvmPackages
3− , cmake, boehmgc, gmp, zlib, ncurses, boost
4− , python, git, sbcl
1+{ stdenv, fetchFromGitHub
2+, llvmPackages
3+, cmake, boehmgc, gmp, zlib, ncurses, boost
4+, python, git, sbcl
5+, wafHook
56}:
67stdenv.mkDerivation rec {
78 name = "${pname}-${version}";
@@ -16,7 +17,7 @@ stdenv.mkDerivation rec {
1617 fetchSubmodules = true;
1718 };
1819
19− nativeBuildInputs = [ cmake python git sbcl ];
20+ nativeBuildInputs = [ cmake python git sbcl wafHook ];
2021
2122 buildInputs = with llvmPackages; (
2223 builtins.map (x: stdenv.lib.overrideDerivation x
@@ -32,36 +33,14 @@ stdenv.mkDerivation rec {
3233
3334 NIX_CFLAGS_COMPILE = " -frtti ";
3435
35− configurePhase = ''
36− runHook preConfigure
37−
38− export CXX=clang++
39− export CC=clang
40−
36+ postPatch = ''
4137 echo "
4238 INSTALL_PATH_PREFIX = '$out'
4339 " | sed -e 's/^ *//' > wscript.config
44−
45− python ./waf configure update_submodules
46−
47− runHook postConfigure
4840 '';
4941
50− buildPhase = ''
51− runHook preBuild
52−
53− python ./waf build_cboehm
54−
55− runHook postBuild
56− '';
57−
58− installPhase = ''
59− runHook preInstall
60−
61− python ./waf install_cboehm
62−
63− runHook postInstall
64− '';
42+ buildTargets = "build_cboehm";
43+ installTargets = "install_cboehm";
6544
6645 meta = {
6746 inherit version;
pkgs/development/libraries/aubio/default.nix+2−8
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate
2−, libsndfile, pkgconfig, python
2+, libsndfile, pkgconfig, python, wafHook
33}:
44
55stdenv.mkDerivation rec {
@@ -10,15 +10,9 @@ stdenv.mkDerivation rec {
1010 sha256 = "0hd0kzfmr46am00ygxar8alrldv92c5azqy701iilfmbqpz4mvfb";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig python ];
13+ nativeBuildInputs = [ pkgconfig python wafHook ];
1414 buildInputs = [ alsaLib fftw libjack2 libsamplerate libsndfile ];
1515
16− configurePhase = "python waf configure --prefix=$out";
17−
18− buildPhase = "python waf";
19−
20− installPhase = "python waf install";
21−
2216 meta = with stdenv.lib; {
2317 description = "Library for audio labelling";
2418 homepage = https://aubio.org/;
pkgs/development/libraries/audio/lilv/default.nix+2−8
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom }:
1+{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom, wafHook }:
22
33stdenv.mkDerivation rec {
44 name = "lilv-${version}";
@@ -9,15 +9,9 @@ stdenv.mkDerivation rec {
99 sha256 = "0f24cd7wkk5l969857g2ydz2kjjrkvvddg1g87xzzs78lsvq8fy3";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkgconfig wafHook ];
1313 buildInputs = [ lv2 python serd sord sratom ];
1414
15− configurePhase = "${python.interpreter} waf configure --prefix=$out";
16−
17− buildPhase = "${python.interpreter} waf";
18−
19− installPhase = "${python.interpreter} waf install";
20−
2115 meta = with stdenv.lib; {
2216 homepage = http://drobilla.net/software/lilv;
2317 description = "A C library to make the use of LV2 plugins";
pkgs/development/libraries/audio/lv2/default.nix+2−8
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python }:
1+{ stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python, wafHook }:
22
33stdenv.mkDerivation rec {
44 name = "lv2-${version}";
@@ -9,15 +9,9 @@ stdenv.mkDerivation rec {
99 sha256 = "0chxwys3vnn3nxc9x2vchm74s9sx0vfra6y893byy12ci61jc1dq";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkgconfig wafHook ];
1313 buildInputs = [ gtk2 libsndfile python ];
1414
15− configurePhase = "${python.interpreter} waf configure --prefix=$out";
16−
17− buildPhase = "${python.interpreter} waf";
18−
19− installPhase = "${python.interpreter} waf install";
20−
2115 meta = with stdenv.lib; {
2216 homepage = http://lv2plug.in;
2317 description = "A plugin standard for audio systems";
pkgs/development/libraries/audio/lv2/unstable.nix+2−8
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python }:
1+{ stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python, wafHook }:
22
33stdenv.mkDerivation rec {
44 name = "lv2-unstable-${version}";
@@ -10,15 +10,9 @@ stdenv.mkDerivation rec {
1010 sha256 = "1gp2rd99dfmpibvpixrqn115mrhybzf3if3h8bssf6siyi13f29r";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkgconfig wafHook ];
1414 buildInputs = [ gtk2 libsndfile python ];
1515
16− configurePhase = "${python.interpreter} waf configure --prefix=$out";
17−
18− buildPhase = "${python.interpreter} waf";
19−
20− installPhase = "${python.interpreter} waf install";
21−
2216 meta = with stdenv.lib; {
2317 homepage = http://lv2plug.in;
2418 description = "A plugin standard for audio systems";
pkgs/development/libraries/audio/lvtk/default.nix+6−11
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, boost, gtkmm2, lv2, pkgconfig, python }:
1+{ stdenv, fetchurl, boost, gtkmm2, lv2, pkgconfig, python, wafHook }:
22
33stdenv.mkDerivation rec {
44 name = "lvtk-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "03nbj2cqcklqwh50zj2gwm07crh5iwqbpxbpzwbg5hvgl4k4rnjd";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig python ];
12+ nativeBuildInputs = [ pkgconfig python wafHook ];
1313 buildInputs = [ boost gtkmm2 lv2 ];
1414
1515 enableParallelBuilding = true;
@@ -19,15 +19,10 @@ stdenv.mkDerivation rec {
1919 sed -i '/target[ ]*= "ttl2c"/ ilib=["boost_system"],' tools/wscript_build
2020 '';
2121
22− configurePhase = ''
23− python waf configure --prefix=$out \
24− --boost-includes="${boost.dev}/include" \
25− --boost-libs="${boost.out}/lib"
26− '';
27−
28− buildPhase = "python waf";
29−
30− installPhase = "python waf install";
22+ configureFlags = [
23+ "--boost-includes=${boost.dev}/include"
24+ "--boost-libs=${boost.out}/lib"
25+ ];
3126
3227 meta = with stdenv.lib; {
3328 description = "A set C++ wrappers around the LV2 C API";
pkgs/development/libraries/audio/ntk/default.nix+2−11
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkgconfig, python2 }:
1+{ stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkgconfig, python2, wafHook }:
22
33stdenv.mkDerivation rec {
44 name = "ntk-${version}";
@@ -10,20 +10,11 @@ stdenv.mkDerivation rec {
1010 sha256 = "0j38mhnfqy6swcrnc5zxcwlqi8b1pgklyghxk6qs1lf4japv2zc0";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkgconfig wafHook ];
1414 buildInputs = [
1515 cairo libjpeg libXft python2
1616 ];
1717
18− buildPhase = ''
19− python waf configure --prefix=$out
20− python waf
21− '';
22−
23− installPhase = ''
24− python waf install
25− '';
26−
2718 meta = {
2819 description = "Fork of FLTK 1.3.0 with additional functionality";
2920 version = "${version}";
pkgs/development/libraries/audio/raul/default.nix+2−8
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, boost, gtk2, pkgconfig, python }:
1+{ stdenv, fetchgit, boost, gtk2, pkgconfig, python, wafHook }:
22
33stdenv.mkDerivation rec {
44 name = "raul-unstable-${rev}";
@@ -10,15 +10,9 @@ stdenv.mkDerivation rec {
1010 sha256 = "04fajrass3ymr72flx5js5vxc601ccrmx8ny8scp0rw7j0igyjdr";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkgconfig wafHook ];
1414 buildInputs = [ boost gtk2 python ];
1515
16− configurePhase = "${python.interpreter} waf configure --prefix=$out";
17−
18− buildPhase = "${python.interpreter} waf";
19−
20− installPhase = "${python.interpreter} waf install";
21−
2216 meta = with stdenv.lib; {
2317 description = "A C++ utility library primarily aimed at audio/musical applications";
2418 homepage = http://drobilla.net/software/raul;
pkgs/development/libraries/audio/sratom/default.nix+2−8
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord }:
1+{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, wafHook }:
22
33stdenv.mkDerivation rec {
44 name = "sratom-${version}";
@@ -9,15 +9,9 @@ stdenv.mkDerivation rec {
99 sha256 = "0lz883ravxjf7r9wwbx2gx9m8vhyiavxrl9jdxfppjxnsralll8a";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkgconfig wafHook ];
1313 buildInputs = [ lv2 python serd sord ];
1414
15− configurePhase = "${python.interpreter} waf configure --prefix=$out";
16−
17− buildPhase = "${python.interpreter} waf";
18−
19− installPhase = "${python.interpreter} waf install";
20−
2115 meta = with stdenv.lib; {
2216 homepage = http://drobilla.net/software/sratom;
2317 description = "A library for serialising LV2 atoms to/from RDF";
pkgs/development/libraries/audio/suil/default.nix+2−7
@@ -1,4 +1,5 @@
11{ stdenv, lib, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom
2+, wafHook
23, withQt4 ? true, qt4 ? null
34, withQt5 ? false, qt5 ? null }:
45
@@ -16,17 +17,11 @@ stdenv.mkDerivation rec {
1617 sha256 = "0j489gm3fhnmwmbgw30bvd4byw1vsy4yazdlnji8jzhcz0qwb5cq";
1718 };
1819
19− nativeBuildInputs = [ pkgconfig ];
20+ nativeBuildInputs = [ pkgconfig wafHook ];
2021 buildInputs = [ gtk2 lv2 python serd sord sratom ]
2122 ++ (lib.optionals withQt4 [ qt4 ])
2223 ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ]));
2324
24− configurePhase = "python waf configure --prefix=$out";
25−
26− buildPhase = "python waf";
27−
28− installPhase = "python waf install";
29−
3025 meta = with stdenv.lib; {
3126 homepage = http://drobilla.net/software/suil;
3227 description = "A lightweight C library for loading and wrapping LV2 plugin UIs";
pkgs/development/libraries/ganv/default.nix+2−8
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkgconfig, python }:
1+{ stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkgconfig, python, wafHook }:
22
33stdenv.mkDerivation rec {
44 name = "ganv-unstable-${rev}";
@@ -10,15 +10,9 @@ stdenv.mkDerivation rec {
1010 sha256 = "0xmbykdl42jn9cgzrqrys5lng67d26nk5xq10wkkvjqldiwdck56";
1111 };
1212
13− nativeBuildInputs = [ pkgconfig ];
13+ nativeBuildInputs = [ pkgconfig wafHook ];
1414 buildInputs = [ graphviz gtk2 gtkmm2 python ];
1515
16− configurePhase = "${python.interpreter} waf configure --prefix=$out";
17−
18− buildPhase = "${python.interpreter} waf";
19−
20− installPhase = "${python.interpreter} waf install";
21−
2216 meta = with stdenv.lib; {
2317 description = "An interactive Gtk canvas widget for graph-based interfaces";
2418 homepage = http://drobilla.net;
pkgs/development/libraries/ndn-cxx/default.nix+8−16
@@ -1,4 +1,5 @@
1−{ stdenv, fetchFromGitHub, openssl, doxygen, boost, sqlite, pkgconfig, python, pythonPackages }:
1+{ stdenv, fetchFromGitHub, openssl, doxygen
2+, boost, sqlite, pkgconfig, python, pythonPackages, wafHook }:
23let
34 version = "0.6.3";
45in
@@ -10,22 +11,13 @@ stdenv.mkDerivation {
1011 rev = "a3bf4319ed483a4a6fe2c96b79ec4491d7217f00";
1112 sha256 = "076jhrjigisqz5n8dgxwd5fhimg69zhm834m7w9yvf9afgzrr50h";
1213 };
13− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ pkgconfig wafHook ];
1415 buildInputs = [ openssl doxygen boost sqlite python pythonPackages.sphinx];
15− preConfigure = ''
16− patchShebangs waf
17− ./waf configure \
18− --prefix=$out \
19− --with-openssl=${openssl.dev} \
20− --boost-includes=${boost.dev}/include \
21− --boost-libs=${boost.out}/lib
22− '';
23− buildPhase = ''
24− ./waf
25− '';
26− installPhase = ''
27− ./waf install
28− '';
16+ configureFlags = [
17+ "--with-openssl=${openssl.dev}"
18+ "--boost-includes=${boost.dev}/include"
19+ "--boost-libs=${boost.out}/lib"
20+ ];
2921 meta = with stdenv.lib; {
3022 homepage = http://named-data.net/;
3123 description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction";
pkgs/development/libraries/science/networking/ns3/default.nix+5−9
@@ -1,6 +1,7 @@
11{ stdenv
22, fetchFromGitHub
33, python
4+, wafHook
45
56# for binding generation
67, castxml ? null
@@ -50,6 +51,7 @@ stdenv.mkDerivation rec {
5051 sha256 = "17kzfjpgw2mvyx1c9bxccnvw67jpk09fxmcnlkqx9xisk10qnhng";
5152 };
5253
54+ nativeBuildInputs = [ wafHook ];
5355 # ncurses is a hidden dependency of waf when checking python
5456 buildInputs = lib.optionals generateBindings [ castxml ncurses ]
5557 ++ stdenv.lib.optional enableDoxygen [ doxygen graphviz imagemagick ]
@@ -58,12 +60,9 @@ stdenv.mkDerivation rec {
5860 propagatedBuildInputs = [ gcc6 pythonEnv ];
5961
6062 postPatch = ''
61− patchShebangs ./waf
6263 patchShebangs doc/ns3_html_theme/get_version.sh
6364 '';
6465
65− configureScript = "${python.interpreter} ./waf configure";
66−
6766 configureFlags = with stdenv.lib; [
6867 "--enable-modules=${stdenv.lib.concatStringsSep "," modules}"
6968 "--with-python=${pythonEnv.interpreter}"
@@ -74,12 +73,9 @@ stdenv.mkDerivation rec {
7473 ++ optional doCheck " --enable-tests "
7574 ;
7675
77− postBuild = with stdenv.lib; let flags = concatStringsSep ";" (
78− optional enableDoxygen "./waf doxygen"
79− ++ optional withManual "./waf sphinx"
80− );
81− in "${flags}"
82− ;
76+ buildTargets = "build"
77+ + lib.optionalString enableDoxygen " doxygen"
78+ + lib.optionalString withManual "sphinx";
8379
8480 doCheck = true;
8581
pkgs/development/libraries/serd/default.nix+2−8
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, python }:
1+{ stdenv, fetchurl, pkgconfig, python, wafHook }:
22
33stdenv.mkDerivation rec {
44 name = "serd-${version}";
@@ -9,13 +9,7 @@ stdenv.mkDerivation rec {
99 sha256 = "1yyfyvc6kwagi5w43ljp1bbjdvdpmgpds74lmjxycm91bkx0xyvf";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig python ];
13−
14− configurePhase = "python waf configure --prefix=$out";
15−
16− buildPhase = "python waf";
17−
18− installPhase = "python waf install";
12+ nativeBuildInputs = [ pkgconfig python wafHook ];
1913
2014 meta = with stdenv.lib; {
2115 homepage = http://drobilla.net/software/serd;
pkgs/development/libraries/sord/default.nix+2−8
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, pkgconfig, python, serd, pcre }:
1+{ stdenv, fetchurl, pkgconfig, python, serd, pcre, wafHook }:
22
33stdenv.mkDerivation rec {
44 name = "sord-${version}";
@@ -9,15 +9,9 @@ stdenv.mkDerivation rec {
99 sha256 = "13fshxwpipjrvsah1m2jw1kf022z2q5vpw24bzcznglgvms13x89";
1010 };
1111
12− nativeBuildInputs = [ pkgconfig ];
12+ nativeBuildInputs = [ pkgconfig wafHook ];
1313 buildInputs = [ python serd pcre ];
1414
15− configurePhase = "${python.interpreter} waf configure --prefix=$out";
16−
17− buildPhase = "${python.interpreter} waf";
18−
19− installPhase = "${python.interpreter} waf install";
20−
2115 meta = with stdenv.lib; {
2216 homepage = http://drobilla.net/software/sord;
2317 description = "A lightweight C library for storing RDF data in memory";
pkgs/development/libraries/termbox/default.nix+2−6
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, python3 }:
1+{ stdenv, fetchFromGitHub, python3, wafHook }:
22
33stdenv.mkDerivation rec {
44 name = "termbox-${version}";
@@ -9,10 +9,7 @@ stdenv.mkDerivation rec {
99 rev = "v${version}";
1010 sha256 = "08yqxzb8fny8806p7x8a6f3phhlbfqdd7dhkv25calswj7w1ssvs";
1111 };
12− nativeBuildInputs = [ python3 ];
13− configurePhase = "python3 ./waf configure --prefix=$out";
14− buildPhase = "python3 ./waf build";
15− installPhase = "python3 ./waf install --destdir=$out";
12+ nativeBuildInputs = [ python3 wafHook ];
1613 meta = with stdenv.lib; {
1714 description = "Library for writing text-based user interfaces";
1815 license = licenses.mit;
@@ -21,4 +18,3 @@ stdenv.mkDerivation rec {
2118 maintainers = with maintainers; [ fgaz ];
2219 };
2320}
24−
pkgs/misc/emulators/wxmupen64plus/default.nix+6−6
@@ -1,4 +1,5 @@
1−{stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU_combined}:
1+{ stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU_combined
2+, wafHook }:
23
34stdenv.mkDerivation {
45 name = "wxmupen64plus-0.3";
@@ -7,18 +8,17 @@ stdenv.mkDerivation {
78 sha256 = "1mnxi4k011dd300k35li2p6x4wccwi6im21qz8dkznnz397ps67c";
89 };
910
11+ nativeBuildInputs = [ wafHook ];
1012 buildInputs = [ python wxGTK29 SDL libX11 libGLU_combined ];
1113
12− configurePhase = ''
14+ preConfigure = ''
1315 tar xf ${mupen64plus.src}
1416 APIDIR=$(eval echo `pwd`/mupen64plus*/source/mupen64plus-core/src/api)
1517 export CXXFLAGS="-I${libX11.dev}/include/X11 -DLIBDIR=\\\"${mupen64plus}/lib/\\\""
1618 export LDFLAGS="-lwx_gtk2u_adv-2.9"
17− python waf configure --mupenapi=$APIDIR --wxconfig=`type -P wx-config` --prefix=$out
18− '';
1919
20− buildPhase = "python waf";
21− installPhase = "python waf install";
20+ configureFlagsArray+=("--mupenapi=$APIDIR" "--wxconfig=`type -P wx-config`")
21+ '';
2222
2323 meta = {
2424 description = "GUI for the Mupen64Plus 2.0 emulator";
pkgs/misc/jackaudio/default.nix+12−23
@@ -1,5 +1,6 @@
11{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper
22, bash, libsamplerate, libsndfile, readline, eigen, celt
3+, wafHook
34# Darwin Dependencies
45, aften, AudioToolbox, CoreAudio, CoreFoundation
56
@@ -35,13 +36,13 @@ stdenv.mkDerivation rec {
3536 sha256 = "0ynpyn0l77m94b50g7ysl795nvam3ra65wx5zb46nxspgbf6wnkh";
3637 };
3738
38− nativeBuildInputs = [ pkgconfig python makeWrapper ];
39+ nativeBuildInputs = [ pkgconfig python makeWrapper wafHook ];
3940 buildInputs = [ libsamplerate libsndfile readline eigen celt
4041 optDbus optPythonDBus optLibffado optAlsaLib optLibopus
41− ] ++ stdenv.lib.optionals stdenv.isDarwin [ aften AudioToolbox CoreAudio CoreFoundation ];
42+ ] ++ optionals stdenv.isDarwin [ aften AudioToolbox CoreAudio CoreFoundation ];
4243
4344 # CoreFoundation 10.10 doesn't include CFNotificationCenter.h yet.
44− patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin-cf.patch ];
45+ patches = optionals stdenv.isDarwin [ ./darwin-cf.patch ];
4546
4647 prePatch = ''
4748 substituteInPlace svnversion_regenerate.sh \
@@ -51,30 +52,18 @@ stdenv.mkDerivation rec {
5152 # It looks like one of the frameworks depends on <CoreFoundation/CFAttributedString.h>
5253 # since frameworks are impure we also have to use the impure CoreFoundation here.
5354 # FIXME: remove when CoreFoundation is updated to 10.11
54− preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
55+ preConfigure = optionalString stdenv.isDarwin ''
5556 export NIX_CFLAGS_COMPILE="-F${CoreFoundation}/Library/Frameworks $NIX_CFLAGS_COMPILE"
5657 '';
5758
58− configurePhase = ''
59− runHook preConfigure
59+ configureFlags = [
60+ "--classic"
61+ "--autostart=${if (optDbus != null) then "dbus" else "classic"}"
62+ ] ++ optional (optDbus != null) "--dbus"
63+ ++ optional (optLibffado != null) "--firewire"
64+ ++ optional (optAlsaLib != null) "--alsa";
6065
61− python waf configure --prefix=$out \
62− ${optionalString (optDbus != null) "--dbus"} \
63− --classic \
64− ${optionalString (optLibffado != null) "--firewire"} \
65− ${optionalString (optAlsaLib != null) "--alsa"} \
66− --autostart=${if (optDbus != null) then "dbus" else "classic"} \
67−
68− runHook postConfigure
69− '';
70−
71− buildPhase = ''
72− python waf build
73− '';
74−
75− installPhase = ''
76− python waf install
77− '' + (if libOnly then ''
66+ postInstall = (if libOnly then ''
7867 rm -rf $out/{bin,share}
7968 rm -rf $out/lib/{jack,libjacknet*,libjackserver*}
8069 '' else ''
pkgs/os-specific/linux/pflask/default.nix+2−12
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, python, waf }:
1+{ lib, stdenv, fetchurl, python, wafHook }:
22
33stdenv.mkDerivation rec {
44 name = "pflask-${version}";
@@ -10,19 +10,9 @@ stdenv.mkDerivation rec {
1010 sha256 = "2545fca37f9da484b46b6fb5e3a9bbba6526a9725189fe4af5227ef6e6fca440";
1111 };
1212
13+ nativeBuildInputs = [ wafHook ];
1314 buildInputs = [ python ];
1415
15− configurePhase = ''
16− ln -s ${waf} waf
17− python waf configure --prefix=$out
18− '';
19− buildPhase = ''
20− python waf build
21− '';
22− installPhase = ''
23− python waf install
24− '';
25−
2616 meta = {
2717 description = "Lightweight process containers for Linux";
2818 homepage = "https://ghedo.github.io/pflask/";
pkgs/tools/graphics/blockhash/default.nix+2−6
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, python, pkgconfig, imagemagick }:
1+{ stdenv, fetchFromGitHub, python, pkgconfig, imagemagick, wafHook }:
22
33stdenv.mkDerivation rec {
44 name = "blockhash-${version}";
@@ -11,13 +11,9 @@ stdenv.mkDerivation rec {
1111 sha256 = "0m7ikppl42iicgmwsb7baajmag7v0p1ab06xckifvrr0zm21bq9p";
1212 };
1313
14− nativeBuildInputs = [ python pkgconfig ];
14+ nativeBuildInputs = [ python pkgconfig wafHook ];
1515 buildInputs = [ imagemagick ];
1616
17− configurePhase = "python waf configure --prefix=$out";
18− buildPhase = "python waf";
19− installPhase = "python waf install";
20−
2117 meta = with stdenv.lib; {
2218 homepage = "http://blockhash.io/";
2319 description = ''
pkgs/tools/graphics/glmark2/default.nix+3−10
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGL, libdrm,
2− python27, wayland, udev, mesa_noglu }:
2+ python27, wayland, udev, mesa_noglu, wafHook }:
33
44stdenv.mkDerivation rec {
55 name = "glmark2-${version}";
@@ -12,19 +12,12 @@ stdenv.mkDerivation rec {
1212 sha256 = "076l75rfl6pnp1wgiwlaihy1vg2advg1z8bi0x84kk259kldgvwn";
1313 };
1414
15− nativeBuildInputs = [ pkgconfig ];
15+ nativeBuildInputs = [ pkgconfig wafHook ];
1616 buildInputs = [
1717 libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland udev mesa_noglu
1818 ];
1919
20− buildPhase = ''
21− python ./waf configure --prefix=$out --with-flavors x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2
22− python2 ./waf
23− '';
24−
25− installPhase = ''
26− python2 ./waf install --destdir="$pkgdir/"
27− '';
20+ configureFlags = ["--with-flavors=x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2"];
2821
2922 meta = with stdenv.lib; {
3023 description = "OpenGL (ES) 2.0 benchmark";
pkgs/tools/networking/weighttp/default.nix+2−6
@@ -1,4 +1,4 @@
1−{ stdenv, fetchgit, python, libev}:
1+{ stdenv, fetchgit, python, libev, wafHook }:
22stdenv.mkDerivation rec {
33 name = "weighttp-${version}";
44 version = "0.4";
@@ -9,12 +9,8 @@ stdenv.mkDerivation rec {
99 sha256 = "14yjmdx9p8g8c3zlrx5qid8k156lsagfwhl3ny54162nxjf7kzgr";
1010 };
1111
12+ nativeBuildInputs = [ wafHook ];
1213 buildInputs = [ python libev ];
13− installPhase = ''
14− python waf configure --prefix=$out
15− python waf build
16− python waf install
17− '';
1814
1915 meta = {
2016 platforms = stdenv.lib.platforms.unix;