about summary refs log tree commit diff
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-04-15 01:34:42 +0200
committeraszlig <aszlig@redmoonstudios.org>2016-04-15 01:34:42 +0200
commit9fa8fb1dec426ad79ff67e01f20d831c322d8525 (patch)
treead7857bad93ee02e80f7e5a46520c5cf2cd099ca
parent8779e0f2741bb3ae2aaf3b85baa35c9d31a4754b (diff)
downloadnixlib-9fa8fb1dec426ad79ff67e01f20d831c322d8525.tar
nixlib-9fa8fb1dec426ad79ff67e01f20d831c322d8525.tar.gz
nixlib-9fa8fb1dec426ad79ff67e01f20d831c322d8525.tar.bz2
nixlib-9fa8fb1dec426ad79ff67e01f20d831c322d8525.tar.lz
nixlib-9fa8fb1dec426ad79ff67e01f20d831c322d8525.tar.xz
nixlib-9fa8fb1dec426ad79ff67e01f20d831c322d8525.tar.zst
nixlib-9fa8fb1dec426ad79ff67e01f20d831c322d8525.zip
antimony: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of antimony
override the whole configurePhase, so this hook isn't run at all.

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

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
-rw-r--r--pkgs/applications/graphics/antimony/default.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix
index dded423652ce..fa9a7e0fdd3f 100644
--- a/pkgs/applications/graphics/antimony/default.nix
+++ b/pkgs/applications/graphics/antimony/default.nix
@@ -32,6 +32,7 @@ in
     ];
 
     configurePhase = ''
+      runHook preConfigure
       export GITREV=${gitRev}
       export GITBRANCH=${gitBranch}
       export GITTAG=${gitTag}
@@ -39,6 +40,7 @@ in
       cd qt
       export sourceRoot=$sourceRoot/qt
       qmake antimony.pro PREFIX=$out
+      runHook postConfigure
     '';
 
     enableParallelBuilding = true;