about summary refs log tree commit diff
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-04-15 04:34:31 +0200
committeraszlig <aszlig@redmoonstudios.org>2016-04-15 05:26:02 +0200
commitcf3f891369655cd30431bd4f2975a46f8adb0167 (patch)
tree047a6b4b06f3f73eab0676ea24f1a657dafcc0c4
parentfab7c7edbf5ad756b60c975dd6c4fd0362719e13 (diff)
linssid: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of linssid
override the whole configurePhase, so this hook isn't run at all.

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

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
-rw-r--r--pkgs/applications/networking/linssid/default.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix
index 76de1d208cc00..4cbc5c8c79670 100644
--- a/pkgs/applications/networking/linssid/default.nix
+++ b/pkgs/applications/networking/linssid/default.nix
@@ -27,7 +27,11 @@ stdenv.mkDerivation rec {
     rm -fr qwt-lib
   '';
 
-  configurePhase = "qmake linssid.pro";
+  configurePhase = ''
+    runHook preConfigure
+    qmake linssid.pro
+    runHook postConfigure
+  '';
 
   meta = with stdenv.lib; {
     description = "Graphical wireless scanning for Linux";