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/applications/misc | |
parent | 92ebfa13833065a23cd3479eefc2624b46ec45dd (diff) | |
download | nixpkgs-f2a20b6e520989bc2c01d362c31fa94cbf6bee52.tar nixpkgs-f2a20b6e520989bc2c01d362c31fa94cbf6bee52.tar.gz nixpkgs-f2a20b6e520989bc2c01d362c31fa94cbf6bee52.tar.bz2 nixpkgs-f2a20b6e520989bc2c01d362c31fa94cbf6bee52.tar.lz nixpkgs-f2a20b6e520989bc2c01d362c31fa94cbf6bee52.tar.xz nixpkgs-f2a20b6e520989bc2c01d362c31fa94cbf6bee52.tar.zst nixpkgs-f2a20b6e520989bc2c01d362c31fa94cbf6bee52.zip |
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/applications/misc')
-rw-r--r-- | pkgs/applications/misc/hamster-time-tracker/default.nix | 14 | ||||
-rw-r--r-- | pkgs/applications/misc/kupfer/default.nix | 22 | ||||
-rw-r--r-- | pkgs/applications/misc/xiphos/default.nix | 17 |
3 files changed, 9 insertions, 44 deletions
diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix index 2abdce45c95..453d95694eb 100644 --- a/pkgs/applications/misc/hamster-time-tracker/default.nix +++ b/pkgs/applications/misc/hamster-time-tracker/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchzip, pythonPackages, docbook2x, libxslt, gnome-doc-utils , intltool, dbus-glib, gnome_python , hicolor-icon-theme +, wafHook }: # TODO: Add optional dependency 'wnck', for "workspace tracking" support. Fixes @@ -17,28 +18,17 @@ pythonPackages.buildPythonApplication rec { sha256 = "1a85rcg561792kdyv744cgzw7mmpmgv6d6li1sijfdpqa1ninf8g"; }; + nativeBuildInputs = [ wafHook ]; buildInputs = [ docbook2x libxslt gnome-doc-utils intltool dbus-glib hicolor-icon-theme ]; propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python ]; - configurePhase = '' - python waf configure --prefix="$out" - ''; - - buildPhase = '' - python waf build - ''; - postFixup = '' wrapPythonProgramsIn $out/lib/hamster-time-tracker "$out $pythonPath" ''; - installPhase = '' - python waf install - ''; - # error: invalid command 'test' doCheck = false; diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index 3072963c43e..0b07767d760 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -8,6 +8,7 @@ , keybinder3 , hicolor-icon-theme , wrapGAppsHook +, wafHook }: with python3Packages; @@ -24,37 +25,20 @@ buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook intltool # For setup hook - gobjectIntrospection + gobjectIntrospection wafHook ]; buildInputs = [ hicolor-icon-theme docutils libwnck3 keybinder3 ]; propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ]; - configurePhase = '' - runHook preConfigure - python ./waf configure --prefix=$prefix - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - python ./waf - runHook postBuild - ''; - - installPhase = let + postInstall = let pythonPath = (stdenv.lib.concatMapStringsSep ":" (m: "${m}/lib/${python.libPrefix}/site-packages") propagatedBuildInputs); in '' - runHook preInstall - python ./waf install - gappsWrapperArgs+=( "--prefix" "PYTHONPATH" : "${pythonPath}" "--set" "PYTHONNOUSERSITE" "1" ) - - runHook postInstall ''; doCheck = false; # no tests diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index bb7b22c40a2..7148caf35d3 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, pkgconfig +{ stdenv, fetchFromGitHub, pkgconfig , python , intltool , docbook2x, docbook_xml_dtd_412, libxslt @@ -9,6 +9,7 @@ , webkitgtk , dbus-glib, enchant, isocodes, libuuid, icu , wrapGAppsHook +, wafHook }: stdenv.mkDerivation rec { @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "1vwf1ps6nrajxl1qbs6v1cgykmq5wn4j09j10gbcd3b2nvrprf3g"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook wafHook ]; buildInputs = [ python intltool docbook2x docbook_xml_dtd_412 libxslt sword clucene_core biblesync gnome-doc-utils libgsf gconf gtkhtml libglade scrollkeeper webkitgtk dbus-glib enchant isocodes libuuid icu ]; @@ -36,17 +37,7 @@ stdenv.mkDerivation rec { export SWORD_HOME=${sword}; ''; - configurePhase = '' - python waf configure --prefix=$out --enable-webkit2 - ''; - - buildPhase = '' - python waf build - ''; - - installPhase = '' - python waf install - ''; + configureFlags= [ "--enable-webkit2" ]; meta = with stdenv.lib; { description = "A GTK Bible study tool"; |