diff options
author | aszlig <aszlig@redmoonstudios.org> | 2016-04-15 04:48:57 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2016-04-15 05:26:02 +0200 |
commit | 9cfc8d94bb22000d1b648066c3d8b580f27d1271 (patch) | |
tree | d8ecc5e3224dfffd08980dd203a14483887b0af9 | |
parent | dbc1605deaeafc07c79cddf4d5e756074d8825b3 (diff) | |
download | nixpkgs-9cfc8d94bb22000d1b648066c3d8b580f27d1271.tar nixpkgs-9cfc8d94bb22000d1b648066c3d8b580f27d1271.tar.gz nixpkgs-9cfc8d94bb22000d1b648066c3d8b580f27d1271.tar.bz2 nixpkgs-9cfc8d94bb22000d1b648066c3d8b580f27d1271.tar.lz nixpkgs-9cfc8d94bb22000d1b648066c3d8b580f27d1271.tar.xz nixpkgs-9cfc8d94bb22000d1b648066c3d8b580f27d1271.tar.zst nixpkgs-9cfc8d94bb22000d1b648066c3d8b580f27d1271.zip |
zeal: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right qmake path. Unfortunately the mkDerivation attributes of zeal override the whole configurePhase, so this hook isn't run at all. This fixes the build of zeal and it now successfully compiles on my machine. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
-rw-r--r-- | pkgs/data/documentation/zeal/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 81be2dfb89b..dd681404e85 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { ]; configurePhase = '' + runHook preConfigure qmake PREFIX=/ + runHook postConfigure ''; installPhase = '' |