diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-11 15:20:41 -0600 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-13 19:13:48 -0600 |
commit | f2a20b6e520989bc2c01d362c31fa94cbf6bee52 (patch) | |
tree | a18463cd63f58a9c217f1d6160315c75ba2a5790 /pkgs/development | |
parent | 92ebfa13833065a23cd3479eefc2624b46ec45dd (diff) |
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
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/clasp/default.nix | 39 | ||||
-rw-r--r-- | pkgs/development/libraries/aubio/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/libraries/audio/lilv/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/libraries/audio/lv2/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/libraries/audio/lv2/unstable.nix | 10 | ||||
-rw-r--r-- | pkgs/development/libraries/audio/lvtk/default.nix | 17 | ||||
-rw-r--r-- | pkgs/development/libraries/audio/ntk/default.nix | 13 | ||||
-rw-r--r-- | pkgs/development/libraries/audio/raul/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/libraries/audio/sratom/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/libraries/audio/suil/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/libraries/ganv/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/libraries/ndn-cxx/default.nix | 24 | ||||
-rw-r--r-- | pkgs/development/libraries/science/networking/ns3/default.nix | 14 | ||||
-rw-r--r-- | pkgs/development/libraries/serd/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/libraries/sord/default.nix | 10 | ||||
-rw-r--r-- | pkgs/development/libraries/termbox/default.nix | 8 |
16 files changed, 52 insertions, 162 deletions
diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix index 2c260e110d60..349482fbde97 100644 --- a/pkgs/development/compilers/clasp/default.nix +++ b/pkgs/development/compilers/clasp/default.nix @@ -1,7 +1,8 @@ -{stdenv, fetchFromGitHub - , llvmPackages - , cmake, boehmgc, gmp, zlib, ncurses, boost - , python, git, sbcl +{ stdenv, fetchFromGitHub +, llvmPackages +, cmake, boehmgc, gmp, zlib, ncurses, boost +, python, git, sbcl +, wafHook }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake python git sbcl ]; + nativeBuildInputs = [ cmake python git sbcl wafHook ]; buildInputs = with llvmPackages; ( builtins.map (x: stdenv.lib.overrideDerivation x @@ -32,36 +33,14 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = " -frtti "; - configurePhase = '' - runHook preConfigure - - export CXX=clang++ - export CC=clang - + postPatch = '' echo " INSTALL_PATH_PREFIX = '$out' " | sed -e 's/^ *//' > wscript.config - - python ./waf configure update_submodules - - runHook postConfigure ''; - buildPhase = '' - runHook preBuild - - python ./waf build_cboehm - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - python ./waf install_cboehm - - runHook postInstall - ''; + buildTargets = "build_cboehm"; + installTargets = "install_cboehm"; meta = { inherit version; diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index 8c8fe25f5000..01ca9a3ec833 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate -, libsndfile, pkgconfig, python +, libsndfile, pkgconfig, python, wafHook }: stdenv.mkDerivation rec { @@ -10,15 +10,9 @@ stdenv.mkDerivation rec { sha256 = "0hd0kzfmr46am00ygxar8alrldv92c5azqy701iilfmbqpz4mvfb"; }; - nativeBuildInputs = [ pkgconfig python ]; + nativeBuildInputs = [ pkgconfig python wafHook ]; buildInputs = [ alsaLib fftw libjack2 libsamplerate libsndfile ]; - configurePhase = "python waf configure --prefix=$out"; - - buildPhase = "python waf"; - - installPhase = "python waf install"; - meta = with stdenv.lib; { description = "Library for audio labelling"; homepage = https://aubio.org/; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index f28e374c852a..373d50a0a434 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom }: +{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom, wafHook }: stdenv.mkDerivation rec { name = "lilv-${version}"; @@ -9,15 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0f24cd7wkk5l969857g2ydz2kjjrkvvddg1g87xzzs78lsvq8fy3"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig wafHook ]; buildInputs = [ lv2 python serd sord sratom ]; - configurePhase = "${python.interpreter} waf configure --prefix=$out"; - - buildPhase = "${python.interpreter} waf"; - - installPhase = "${python.interpreter} waf install"; - meta = with stdenv.lib; { homepage = http://drobilla.net/software/lilv; description = "A C library to make the use of LV2 plugins"; diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index 3df8f5e30789..5b98a88a8fb5 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python }: +{ stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python, wafHook }: stdenv.mkDerivation rec { name = "lv2-${version}"; @@ -9,15 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0chxwys3vnn3nxc9x2vchm74s9sx0vfra6y893byy12ci61jc1dq"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig wafHook ]; buildInputs = [ gtk2 libsndfile python ]; - configurePhase = "${python.interpreter} waf configure --prefix=$out"; - - buildPhase = "${python.interpreter} waf"; - - installPhase = "${python.interpreter} waf install"; - meta = with stdenv.lib; { homepage = http://lv2plug.in; description = "A plugin standard for audio systems"; diff --git a/pkgs/development/libraries/audio/lv2/unstable.nix b/pkgs/development/libraries/audio/lv2/unstable.nix index 4a632d07006b..81cc868f52ca 100644 --- a/pkgs/development/libraries/audio/lv2/unstable.nix +++ b/pkgs/development/libraries/audio/lv2/unstable.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python }: +{ stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python, wafHook }: stdenv.mkDerivation rec { name = "lv2-unstable-${version}"; @@ -10,15 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1gp2rd99dfmpibvpixrqn115mrhybzf3if3h8bssf6siyi13f29r"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig wafHook ]; buildInputs = [ gtk2 libsndfile python ]; - configurePhase = "${python.interpreter} waf configure --prefix=$out"; - - buildPhase = "${python.interpreter} waf"; - - installPhase = "${python.interpreter} waf install"; - meta = with stdenv.lib; { homepage = http://lv2plug.in; description = "A plugin standard for audio systems"; diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index c74c8caa23fd..b6203a159e6c 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, gtkmm2, lv2, pkgconfig, python }: +{ stdenv, fetchurl, boost, gtkmm2, lv2, pkgconfig, python, wafHook }: stdenv.mkDerivation rec { name = "lvtk-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "03nbj2cqcklqwh50zj2gwm07crh5iwqbpxbpzwbg5hvgl4k4rnjd"; }; - nativeBuildInputs = [ pkgconfig python ]; + nativeBuildInputs = [ pkgconfig python wafHook ]; buildInputs = [ boost gtkmm2 lv2 ]; enableParallelBuilding = true; @@ -19,15 +19,10 @@ stdenv.mkDerivation rec { sed -i '/target[ ]*= "ttl2c"/ ilib=["boost_system"],' tools/wscript_build ''; - configurePhase = '' - python waf configure --prefix=$out \ - --boost-includes="${boost.dev}/include" \ - --boost-libs="${boost.out}/lib" - ''; - - buildPhase = "python waf"; - - installPhase = "python waf install"; + configureFlags = [ + "--boost-includes=${boost.dev}/include" + "--boost-libs=${boost.out}/lib" + ]; meta = with stdenv.lib; { description = "A set C++ wrappers around the LV2 C API"; diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix index 6e7cb8d020bd..ddd3940098a4 100644 --- a/pkgs/development/libraries/audio/ntk/default.nix +++ b/pkgs/development/libraries/audio/ntk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkgconfig, python2 }: +{ stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkgconfig, python2, wafHook }: stdenv.mkDerivation rec { name = "ntk-${version}"; @@ -10,20 +10,11 @@ stdenv.mkDerivation rec { sha256 = "0j38mhnfqy6swcrnc5zxcwlqi8b1pgklyghxk6qs1lf4japv2zc0"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig wafHook ]; buildInputs = [ cairo libjpeg libXft python2 ]; - buildPhase = '' - python waf configure --prefix=$out - python waf - ''; - - installPhase = '' - python waf install - ''; - meta = { description = "Fork of FLTK 1.3.0 with additional functionality"; version = "${version}"; diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix index 63e3ae36028b..51234a415fd7 100644 --- a/pkgs/development/libraries/audio/raul/default.nix +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, boost, gtk2, pkgconfig, python }: +{ stdenv, fetchgit, boost, gtk2, pkgconfig, python, wafHook }: stdenv.mkDerivation rec { name = "raul-unstable-${rev}"; @@ -10,15 +10,9 @@ stdenv.mkDerivation rec { sha256 = "04fajrass3ymr72flx5js5vxc601ccrmx8ny8scp0rw7j0igyjdr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig wafHook ]; buildInputs = [ boost gtk2 python ]; - configurePhase = "${python.interpreter} waf configure --prefix=$out"; - - buildPhase = "${python.interpreter} waf"; - - installPhase = "${python.interpreter} waf install"; - meta = with stdenv.lib; { description = "A C++ utility library primarily aimed at audio/musical applications"; homepage = http://drobilla.net/software/raul; diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index acfbced52720..09a6230184af 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord }: +{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, wafHook }: stdenv.mkDerivation rec { name = "sratom-${version}"; @@ -9,15 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0lz883ravxjf7r9wwbx2gx9m8vhyiavxrl9jdxfppjxnsralll8a"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig wafHook ]; buildInputs = [ lv2 python serd sord ]; - configurePhase = "${python.interpreter} waf configure --prefix=$out"; - - buildPhase = "${python.interpreter} waf"; - - installPhase = "${python.interpreter} waf install"; - meta = with stdenv.lib; { homepage = http://drobilla.net/software/sratom; description = "A library for serialising LV2 atoms to/from RDF"; diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index e29c7b5cb122..10d650d66425 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -1,4 +1,5 @@ { stdenv, lib, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom +, wafHook , withQt4 ? true, qt4 ? null , withQt5 ? false, qt5 ? null }: @@ -16,17 +17,11 @@ stdenv.mkDerivation rec { sha256 = "0j489gm3fhnmwmbgw30bvd4byw1vsy4yazdlnji8jzhcz0qwb5cq"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig wafHook ]; buildInputs = [ gtk2 lv2 python serd sord sratom ] ++ (lib.optionals withQt4 [ qt4 ]) ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ])); - configurePhase = "python waf configure --prefix=$out"; - - buildPhase = "python waf"; - - installPhase = "python waf install"; - meta = with stdenv.lib; { homepage = http://drobilla.net/software/suil; description = "A lightweight C library for loading and wrapping LV2 plugin UIs"; diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix index 5a21af6a2b33..58356f0bc676 100644 --- a/pkgs/development/libraries/ganv/default.nix +++ b/pkgs/development/libraries/ganv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkgconfig, python }: +{ stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkgconfig, python, wafHook }: stdenv.mkDerivation rec { name = "ganv-unstable-${rev}"; @@ -10,15 +10,9 @@ stdenv.mkDerivation rec { sha256 = "0xmbykdl42jn9cgzrqrys5lng67d26nk5xq10wkkvjqldiwdck56"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig wafHook ]; buildInputs = [ graphviz gtk2 gtkmm2 python ]; - configurePhase = "${python.interpreter} waf configure --prefix=$out"; - - buildPhase = "${python.interpreter} waf"; - - installPhase = "${python.interpreter} waf install"; - meta = with stdenv.lib; { description = "An interactive Gtk canvas widget for graph-based interfaces"; homepage = http://drobilla.net; diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index a8d7f654a9ff..923bc61f67da 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, openssl, doxygen, boost, sqlite, pkgconfig, python, pythonPackages }: +{ stdenv, fetchFromGitHub, openssl, doxygen +, boost, sqlite, pkgconfig, python, pythonPackages, wafHook }: let version = "0.6.3"; in @@ -10,22 +11,13 @@ stdenv.mkDerivation { rev = "a3bf4319ed483a4a6fe2c96b79ec4491d7217f00"; sha256 = "076jhrjigisqz5n8dgxwd5fhimg69zhm834m7w9yvf9afgzrr50h"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig wafHook ]; buildInputs = [ openssl doxygen boost sqlite python pythonPackages.sphinx]; - preConfigure = '' - patchShebangs waf - ./waf configure \ - --prefix=$out \ - --with-openssl=${openssl.dev} \ - --boost-includes=${boost.dev}/include \ - --boost-libs=${boost.out}/lib - ''; - buildPhase = '' - ./waf - ''; - installPhase = '' - ./waf install - ''; + configureFlags = [ + "--with-openssl=${openssl.dev}" + "--boost-includes=${boost.dev}/include" + "--boost-libs=${boost.out}/lib" + ]; meta = with stdenv.lib; { homepage = http://named-data.net/; description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction"; diff --git a/pkgs/development/libraries/science/networking/ns3/default.nix b/pkgs/development/libraries/science/networking/ns3/default.nix index 632380328db1..d5c3ca2457aa 100644 --- a/pkgs/development/libraries/science/networking/ns3/default.nix +++ b/pkgs/development/libraries/science/networking/ns3/default.nix @@ -1,6 +1,7 @@ { stdenv , fetchFromGitHub , python +, wafHook # for binding generation , castxml ? null @@ -50,6 +51,7 @@ stdenv.mkDerivation rec { sha256 = "17kzfjpgw2mvyx1c9bxccnvw67jpk09fxmcnlkqx9xisk10qnhng"; }; + nativeBuildInputs = [ wafHook ]; # ncurses is a hidden dependency of waf when checking python buildInputs = lib.optionals generateBindings [ castxml ncurses ] ++ stdenv.lib.optional enableDoxygen [ doxygen graphviz imagemagick ] @@ -58,12 +60,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gcc6 pythonEnv ]; postPatch = '' - patchShebangs ./waf patchShebangs doc/ns3_html_theme/get_version.sh ''; - configureScript = "${python.interpreter} ./waf configure"; - configureFlags = with stdenv.lib; [ "--enable-modules=${stdenv.lib.concatStringsSep "," modules}" "--with-python=${pythonEnv.interpreter}" @@ -74,12 +73,9 @@ stdenv.mkDerivation rec { ++ optional doCheck " --enable-tests " ; - postBuild = with stdenv.lib; let flags = concatStringsSep ";" ( - optional enableDoxygen "./waf doxygen" - ++ optional withManual "./waf sphinx" - ); - in "${flags}" - ; + buildTargets = "build" + + lib.optionalString enableDoxygen " doxygen" + + lib.optionalString withManual "sphinx"; doCheck = true; diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 67e0ff31c8e5..533fefa9f194 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python }: +{ stdenv, fetchurl, pkgconfig, python, wafHook }: stdenv.mkDerivation rec { name = "serd-${version}"; @@ -9,13 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1yyfyvc6kwagi5w43ljp1bbjdvdpmgpds74lmjxycm91bkx0xyvf"; }; - nativeBuildInputs = [ pkgconfig python ]; - - configurePhase = "python waf configure --prefix=$out"; - - buildPhase = "python waf"; - - installPhase = "python waf install"; + nativeBuildInputs = [ pkgconfig python wafHook ]; meta = with stdenv.lib; { homepage = http://drobilla.net/software/serd; diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index 465ec5b8fe8b..10258e791ba6 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python, serd, pcre }: +{ stdenv, fetchurl, pkgconfig, python, serd, pcre, wafHook }: stdenv.mkDerivation rec { name = "sord-${version}"; @@ -9,15 +9,9 @@ stdenv.mkDerivation rec { sha256 = "13fshxwpipjrvsah1m2jw1kf022z2q5vpw24bzcznglgvms13x89"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig wafHook ]; buildInputs = [ python serd pcre ]; - configurePhase = "${python.interpreter} waf configure --prefix=$out"; - - buildPhase = "${python.interpreter} waf"; - - installPhase = "${python.interpreter} waf install"; - meta = with stdenv.lib; { homepage = http://drobilla.net/software/sord; description = "A lightweight C library for storing RDF data in memory"; diff --git a/pkgs/development/libraries/termbox/default.nix b/pkgs/development/libraries/termbox/default.nix index 0898289978a2..469a6a4c96f9 100644 --- a/pkgs/development/libraries/termbox/default.nix +++ b/pkgs/development/libraries/termbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3 }: +{ stdenv, fetchFromGitHub, python3, wafHook }: stdenv.mkDerivation rec { name = "termbox-${version}"; @@ -9,10 +9,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "08yqxzb8fny8806p7x8a6f3phhlbfqdd7dhkv25calswj7w1ssvs"; }; - nativeBuildInputs = [ python3 ]; - configurePhase = "python3 ./waf configure --prefix=$out"; - buildPhase = "python3 ./waf build"; - installPhase = "python3 ./waf install --destdir=$out"; + nativeBuildInputs = [ python3 wafHook ]; meta = with stdenv.lib; { description = "Library for writing text-based user interfaces"; license = licenses.mit; @@ -21,4 +18,3 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; }; } - |