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/compilers/clasp | |
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/compilers/clasp')
-rw-r--r-- | pkgs/development/compilers/clasp/default.nix | 39 |
1 files changed, 9 insertions, 30 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; |