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
This commit is contained in:
@@ -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 = ''
|
||||
|
||||
@@ -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";
|
||||
|
||||
Reference in New Issue
Block a user