diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-04-15 01:27:40 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-04-15 01:29:56 +0200 |
| commit | 8779e0f2741bb3ae2aaf3b85baa35c9d31a4754b (patch) | |
| tree | 33f231697fb340a70c519da61fd24fff93a245fb /pkgs/development/libraries/qwt | |
| parent | d663b3df24b709fd972525ab73855843ff35d09d (diff) | |
| download | nixlib-8779e0f2741bb3ae2aaf3b85baa35c9d31a4754b.tar nixlib-8779e0f2741bb3ae2aaf3b85baa35c9d31a4754b.tar.gz nixlib-8779e0f2741bb3ae2aaf3b85baa35c9d31a4754b.tar.bz2 nixlib-8779e0f2741bb3ae2aaf3b85baa35c9d31a4754b.tar.lz nixlib-8779e0f2741bb3ae2aaf3b85baa35c9d31a4754b.tar.xz nixlib-8779e0f2741bb3ae2aaf3b85baa35c9d31a4754b.tar.zst nixlib-8779e0f2741bb3ae2aaf3b85baa35c9d31a4754b.zip | |
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 <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/development/libraries/qwt')
| -rw-r--r-- | pkgs/development/libraries/qwt/6.nix | 6 | ||||
| -rw-r--r-- | 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 d4819d70bfc8..a99573ca5e43 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 4aa7c0bc7d5a..451784261f82 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"; |