JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt5.qwt: Fix running of {pre,post}Configure

Browse Source 
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>
This commit is contained in:
aszlig 2016-04-15 01:27:40 +02:00
parent d663b3df24
commit 8779e0f274
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/qwt/6.nix
View File

@ -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";

6
pkgs/development/libraries/qwt/default.nix
View File

@ -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";