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

qt5.qwt: move to qmakeHook

Browse Source 
This reverts commit 8779e0f2741bb3ae2aaf3b85baa35c9d31a4754b.
This commit is contained in:
Nikolay Amiantov 2016-04-16 23:01:26 +03:00
parent 82af8640e3
commit d441238b52
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, qtbase, qtsvg, qttools }: { stdenv, fetchurl, qtbase, qtsvg, qttools, qmakeHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qwt-6.1.2"; name = "qwt-6.1.2";
@ -9,16 +9,13 @@ stdenv.mkDerivation rec {
}; };
propagatedBuildInputs = [ qtbase qtsvg qttools ]; propagatedBuildInputs = [ qtbase qtsvg qttools ];
nativeBuildInputs = [ qmakeHook ];
postPatch = '' postPatch = ''
sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri
''; '';
configurePhase = '' qmakeFlags = [ "-after doc.path=$out/share/doc/${name}" ];
runHook preConfigure
qmake -after doc.path=$out/share/doc/${name} -r
runHook postConfigure
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Qt widgets for technical applications"; description = "Qt widgets for technical applications";

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

@ -15,11 +15,7 @@ stdenv.mkDerivation rec {
sed -e "s|INSTALLBASE.*=.*|INSTALLBASE = $out|g" -i qwtconfig.pri sed -e "s|INSTALLBASE.*=.*|INSTALLBASE = $out|g" -i qwtconfig.pri
''; '';
configurePhase = '' configurePhase = ''qmake INSTALLBASE=$out -after doc.path=$out/share/doc/${name} -r'';
runHook preConfigure
qmake INSTALLBASE=$out -after doc.path=$out/share/doc/${name} -r
runHook postConfigure
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Qt widgets for technical applications"; description = "Qt widgets for technical applications";