From 97d89ad7eee9dcfd17b696ebd69b30d242c2d3cb Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 15 Apr 2016 04:21:58 +0200 Subject: [PATCH] fmit: Fix running of {pre,post}Configure Commit 0055c6a introduced a new preConfigure hook that sets the right qmake path. Unfortunately the mkDerivation attributes of fmit override the whole configurePhase, so this hook isn't run at all. This doesn't fix the build of fmit, because it's unable to find GL/glu.h. However I think this isn't an issue of the fmit package but rather rooted in propagating the wrong output paths from freeglut. Signed-off-by: aszlig --- pkgs/applications/audio/fmit/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 21d1d0ef4c6..c27e049a4ae 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals portaudioSupport [ portaudio ]; configurePhase = '' + runHook preConfigure mkdir build cd build qmake \ @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { CONFIG+=${stdenv.lib.optionalString portaudioSupport "acs_portaudio"} \ PREFIX="$out" PREFIXSHORTCUT="$out" \ ../fmit.pro + runHook postConfigure ''; enableParallelBuilding = true;