summary refs log tree commit diff
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-04-15 04:40:16 +0200
committeraszlig <aszlig@redmoonstudios.org>2016-04-15 05:26:02 +0200
commit81fc546df3e9549aaba1581ea8c5425ddd0f0e34 (patch)
treebab27fff8139fa9f91d40e991009c4ed40b61454
parentcf3f891369655cd30431bd4f2975a46f8adb0167 (diff)
downloadnixpkgs-81fc546df3e9549aaba1581ea8c5425ddd0f0e34.tar
nixpkgs-81fc546df3e9549aaba1581ea8c5425ddd0f0e34.tar.gz
nixpkgs-81fc546df3e9549aaba1581ea8c5425ddd0f0e34.tar.bz2
nixpkgs-81fc546df3e9549aaba1581ea8c5425ddd0f0e34.tar.lz
nixpkgs-81fc546df3e9549aaba1581ea8c5425ddd0f0e34.tar.xz
nixpkgs-81fc546df3e9549aaba1581ea8c5425ddd0f0e34.tar.zst
nixpkgs-81fc546df3e9549aaba1581ea8c5425ddd0f0e34.zip
fritzing: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of fritzing
override the whole configurePhase, so this hook isn't run at all.

This fixes the build of fritzing and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
-rw-r--r--pkgs/applications/science/electronics/fritzing/default.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix
index 302c6a318e6..ff0502ac0cb 100644
--- a/pkgs/applications/science/electronics/fritzing/default.nix
+++ b/pkgs/applications/science/electronics/fritzing/default.nix
@@ -17,9 +17,11 @@ stdenv.mkDerivation rec {
   buildInputs = [ qtbase qtsvg boost ];
 
   configurePhase = ''
+    runHook preConfigure
     cd fritzing-${version}.source
     echo $PATH
     qmake PREFIX=$out phoenix.pro
+    runHook postConfigure
   '';
 
   meta = {