diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-16 22:59:19 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-20 18:55:44 +0300 |
| commit | f3384e5ea9fbef6eeaad3f1046c1193d81dd2b05 (patch) | |
| tree | 92f577ea14838c1c3ceafdce08b974d2874db552 /pkgs/applications/misc/qtpass | |
| parent | eeffa2202a6652e67a3fa2c6ba1234b2e963d530 (diff) | |
| download | nixpkgs-f3384e5ea9fbef6eeaad3f1046c1193d81dd2b05.tar nixpkgs-f3384e5ea9fbef6eeaad3f1046c1193d81dd2b05.tar.gz nixpkgs-f3384e5ea9fbef6eeaad3f1046c1193d81dd2b05.tar.bz2 nixpkgs-f3384e5ea9fbef6eeaad3f1046c1193d81dd2b05.tar.lz nixpkgs-f3384e5ea9fbef6eeaad3f1046c1193d81dd2b05.tar.xz nixpkgs-f3384e5ea9fbef6eeaad3f1046c1193d81dd2b05.tar.zst nixpkgs-f3384e5ea9fbef6eeaad3f1046c1193d81dd2b05.zip | |
qtpass: move to qmakeHook
This reverts commit 0cfff33f59131ec124b0e1c0de2a8a69ef4af896.
Diffstat (limited to 'pkgs/applications/misc/qtpass')
| -rw-r--r-- | pkgs/applications/misc/qtpass/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 69730759d08..15f249ac906 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools }: +{ stdenv, fetchurl, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools, qmakeHook }: stdenv.mkDerivation rec { name = "qtpass-${version}"; @@ -9,12 +9,10 @@ stdenv.mkDerivation rec { sha256 = "60b458062f54184057e55dbd9c93958a8bf845244ffd70b9cb31bf58697f0dc6"; }; - buildInputs = [ git gnupg makeQtWrapper pass qtbase qtsvg qttools ]; + buildInputs = [ git gnupg makeQtWrapper pass qtbase qtsvg qttools qmakeHook ]; - configurePhase = '' - runHook preConfigure - qmake CONFIG+=release PREFIX=$out DESTDIR=$out - runHook postConfigure + preConfigure = '' + qmakeFlags="$qmakeFlags CONFIG+=release DESTDIR=$out" ''; installPhase = '' |