summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2016-04-17 02:50:08 +0300
committerNikolay Amiantov <ab@fmap.me>2016-04-20 18:55:53 +0300
commit1b032e5221da9cc56ea2a89950d068173ba7b517 (patch)
tree3510c617bbd60abe0b57a10499937f3f42ffd97a /pkgs
parentd441238b52693c8318840a2e3a8a5d9731fe0c1a (diff)
downloadnixpkgs-1b032e5221da9cc56ea2a89950d068173ba7b517.tar
nixpkgs-1b032e5221da9cc56ea2a89950d068173ba7b517.tar.gz
nixpkgs-1b032e5221da9cc56ea2a89950d068173ba7b517.tar.bz2
nixpkgs-1b032e5221da9cc56ea2a89950d068173ba7b517.tar.lz
nixpkgs-1b032e5221da9cc56ea2a89950d068173ba7b517.tar.xz
nixpkgs-1b032e5221da9cc56ea2a89950d068173ba7b517.tar.zst
nixpkgs-1b032e5221da9cc56ea2a89950d068173ba7b517.zip
qwt: move to qmake4Hook
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/qwt/default.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix
index 4aa7c0bc7d5..da5769e92cd 100644
--- a/pkgs/development/libraries/qwt/default.nix
+++ b/pkgs/development/libraries/qwt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4 }:
+{ stdenv, fetchurl, qt4, qmake4Hook }:
 
 stdenv.mkDerivation rec {
   name = "qwt-5.2.3";
@@ -9,13 +9,16 @@ stdenv.mkDerivation rec {
   };
 
   propagatedBuildInputs = [ qt4 ];
+  nativeBuildInputs = [ qmake4Hook ];
 
   postPatch = ''
     sed -e "s@\$\$\[QT_INSTALL_PLUGINS\]@$out/lib/qt4/plugins@" -i designer/designer.pro
     sed -e "s|INSTALLBASE.*=.*|INSTALLBASE = $out|g" -i qwtconfig.pri
   '';
 
-  configurePhase = ''qmake INSTALLBASE=$out -after doc.path=$out/share/doc/${name} -r'';
+  preConfigure = ''
+    qmakeFlags="$qmakeFlags INSTALLBASE=$out -after doc.path=$out/share/doc/${name}"
+  '';
 
   meta = with stdenv.lib; {
     description = "Qt widgets for technical applications";