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/tools/graphics | |
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/tools/graphics')
-rw-r--r-- | pkgs/tools/graphics/blockhash/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/graphics/glmark2/default.nix | 13 |
2 files changed, 5 insertions, 16 deletions
diff --git a/pkgs/tools/graphics/blockhash/default.nix b/pkgs/tools/graphics/blockhash/default.nix index 5ddf8185b3cfa..ad72933cc7717 100644 --- a/pkgs/tools/graphics/blockhash/default.nix +++ b/pkgs/tools/graphics/blockhash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, pkgconfig, imagemagick }: +{ stdenv, fetchFromGitHub, python, pkgconfig, imagemagick, wafHook }: stdenv.mkDerivation rec { name = "blockhash-${version}"; @@ -11,13 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0m7ikppl42iicgmwsb7baajmag7v0p1ab06xckifvrr0zm21bq9p"; }; - nativeBuildInputs = [ python pkgconfig ]; + nativeBuildInputs = [ python pkgconfig wafHook ]; buildInputs = [ imagemagick ]; - configurePhase = "python waf configure --prefix=$out"; - buildPhase = "python waf"; - installPhase = "python waf install"; - meta = with stdenv.lib; { homepage = "http://blockhash.io/"; description = '' diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index 14972fc5e56f8..70821468992b0 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGL, libdrm, - python27, wayland, udev, mesa_noglu }: + python27, wayland, udev, mesa_noglu, wafHook }: stdenv.mkDerivation rec { name = "glmark2-${version}"; @@ -12,19 +12,12 @@ stdenv.mkDerivation rec { sha256 = "076l75rfl6pnp1wgiwlaihy1vg2advg1z8bi0x84kk259kldgvwn"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig wafHook ]; buildInputs = [ libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland udev mesa_noglu ]; - buildPhase = '' - python ./waf configure --prefix=$out --with-flavors x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2 - python2 ./waf - ''; - - installPhase = '' - python2 ./waf install --destdir="$pkgdir/" - ''; + configureFlags = ["--with-flavors=x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2"]; meta = with stdenv.lib; { description = "OpenGL (ES) 2.0 benchmark"; |