From 8779e0f2741bb3ae2aaf3b85baa35c9d31a4754b Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 15 Apr 2016 01:27:40 +0200 Subject: [PATCH] qt5.qwt: Fix running of {pre,post}Configure Commit 0055c6a introduced a new preConfigure hook that sets the right qmake path. Unfortunately the mkDerivation attributes of qwt override the whole configurePhase, so this hook isn't run at all. This fixes the build of qwt and it now successfully compiles on my machine. Signed-off-by: aszlig --- pkgs/development/libraries/qwt/6.nix | 6 +++++- pkgs/development/libraries/qwt/default.nix | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix index d4819d70bfc..a99573ca5e4 100644 --- a/pkgs/development/libraries/qwt/6.nix +++ b/pkgs/development/libraries/qwt/6.nix @@ -14,7 +14,11 @@ stdenv.mkDerivation rec { sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri ''; - configurePhase = "qmake -after doc.path=$out/share/doc/${name} -r"; + configurePhase = '' + runHook preConfigure + qmake -after doc.path=$out/share/doc/${name} -r + runHook postConfigure + ''; meta = with stdenv.lib; { description = "Qt widgets for technical applications"; diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index 4aa7c0bc7d5..451784261f8 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -15,7 +15,11 @@ stdenv.mkDerivation rec { sed -e "s|INSTALLBASE.*=.*|INSTALLBASE = $out|g" -i qwtconfig.pri ''; - configurePhase = ''qmake INSTALLBASE=$out -after doc.path=$out/share/doc/${name} -r''; + configurePhase = '' + runHook preConfigure + qmake INSTALLBASE=$out -after doc.path=$out/share/doc/${name} -r + runHook postConfigure + ''; meta = with stdenv.lib; { description = "Qt widgets for technical applications";