mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-15 03:15:56 +03:00
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>
This commit is contained in:
parent
d663b3df24
commit
8779e0f274
@ -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";
|
||||
|
@ -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";
|
||||
|
Loading…
Reference in New Issue
Block a user