diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-16 23:01:26 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-20 18:55:53 +0300 |
| commit | d441238b52693c8318840a2e3a8a5d9731fe0c1a (patch) | |
| tree | 1c5572123b0927e04bc7ccf91a418ad0aa2e5840 /pkgs | |
| parent | 82af8640e36c4b37ff3034f3a410334aa6f19caf (diff) | |
| download | nixpkgs-d441238b52693c8318840a2e3a8a5d9731fe0c1a.tar nixpkgs-d441238b52693c8318840a2e3a8a5d9731fe0c1a.tar.gz nixpkgs-d441238b52693c8318840a2e3a8a5d9731fe0c1a.tar.bz2 nixpkgs-d441238b52693c8318840a2e3a8a5d9731fe0c1a.tar.lz nixpkgs-d441238b52693c8318840a2e3a8a5d9731fe0c1a.tar.xz nixpkgs-d441238b52693c8318840a2e3a8a5d9731fe0c1a.tar.zst nixpkgs-d441238b52693c8318840a2e3a8a5d9731fe0c1a.zip | |
qt5.qwt: move to qmakeHook
This reverts commit 8779e0f2741bb3ae2aaf3b85baa35c9d31a4754b.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/qwt/6.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/libraries/qwt/default.nix | 6 |
2 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix index a99573ca5e4..cd940b818e9 100644 --- a/pkgs/development/libraries/qwt/6.nix +++ b/pkgs/development/libraries/qwt/6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtbase, qtsvg, qttools }: +{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmakeHook }: stdenv.mkDerivation rec { name = "qwt-6.1.2"; @@ -9,16 +9,13 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ qtbase qtsvg qttools ]; + nativeBuildInputs = [ qmakeHook ]; postPatch = '' sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri ''; - configurePhase = '' - runHook preConfigure - qmake -after doc.path=$out/share/doc/${name} -r - runHook postConfigure - ''; + qmakeFlags = [ "-after doc.path=$out/share/doc/${name}" ]; 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 451784261f8..4aa7c0bc7d5 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -15,11 +15,7 @@ stdenv.mkDerivation rec { sed -e "s|INSTALLBASE.*=.*|INSTALLBASE = $out|g" -i qwtconfig.pri ''; - configurePhase = '' - runHook preConfigure - qmake INSTALLBASE=$out -after doc.path=$out/share/doc/${name} -r - runHook postConfigure - ''; + configurePhase = ''qmake INSTALLBASE=$out -after doc.path=$out/share/doc/${name} -r''; meta = with stdenv.lib; { description = "Qt widgets for technical applications"; |