diff options
author | aszlig <aszlig@redmoonstudios.org> | 2016-04-15 04:32:30 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2016-04-15 05:26:02 +0200 |
commit | 0cfff33f59131ec124b0e1c0de2a8a69ef4af896 (patch) | |
tree | de711ebf9c48112800f91a0709240b6dd5567ba4 /pkgs/applications/misc/qtpass | |
parent | 38d5c07b1447e807ab4723a271cbfcfece22c3df (diff) | |
download | nixpkgs-0cfff33f59131ec124b0e1c0de2a8a69ef4af896.tar nixpkgs-0cfff33f59131ec124b0e1c0de2a8a69ef4af896.tar.gz nixpkgs-0cfff33f59131ec124b0e1c0de2a8a69ef4af896.tar.bz2 nixpkgs-0cfff33f59131ec124b0e1c0de2a8a69ef4af896.tar.lz nixpkgs-0cfff33f59131ec124b0e1c0de2a8a69ef4af896.tar.xz nixpkgs-0cfff33f59131ec124b0e1c0de2a8a69ef4af896.tar.zst nixpkgs-0cfff33f59131ec124b0e1c0de2a8a69ef4af896.zip |
qtpass: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right qmake path. Unfortunately the mkDerivation attributes of qtpass override the whole configurePhase, so this hook isn't run at all. This fixes the build of qtpass and it now successfully compiles on my machine. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/applications/misc/qtpass')
-rw-r--r-- | pkgs/applications/misc/qtpass/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 08e7f834d6b..69730759d08 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -11,7 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ git gnupg makeQtWrapper pass qtbase qtsvg qttools ]; - configurePhase = "qmake CONFIG+=release PREFIX=$out DESTDIR=$out"; + configurePhase = '' + runHook preConfigure + qmake CONFIG+=release PREFIX=$out DESTDIR=$out + runHook postConfigure + ''; installPhase = '' mkdir $out/bin |