From 395a4b819be6f59ec8fdb841071b0508e7b7c0be Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:26:19 +0300 Subject: [PATCH] sonic-visualiser: move to qmakeHook --- pkgs/applications/audio/sonic-visualiser/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index ae7a39240a5..31a95c51fc5 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -3,7 +3,7 @@ { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate , libsndfile, pkgconfig, libpulseaudio, makeQtWrapper, qtbase, redland -, rubberband, serd, sord, vampSDK, fftwFloat +, qmakeHook, rubberband, serd, sord, vampSDK, fftwFloat }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ libsndfile qtbase fftw fftwFloat bzip2 librdf rubberband + [ libsndfile qtbase qmakeHook fftw fftwFloat bzip2 librdf rubberband libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland serd sord @@ -32,13 +32,12 @@ stdenv.mkDerivation rec { libX11 ]; - nativeBuildInputs = [ makeQtWrapper ]; + nativeBuildInputs = [ makeQtWrapper qmakeHook ]; - buildPhase = '' + configurePhase = '' for i in sonic-visualiser svapp svcore svgui; - do cd $i && qmake -makefile PREFIX=$out && cd ..; + do cd $i && qmake PREFIX=$out && cd ..; done - make ''; installPhase = ''