diff options
author | aszlig <aszlig@redmoonstudios.org> | 2016-04-15 04:21:58 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2016-04-15 05:26:02 +0200 |
commit | 97d89ad7eee9dcfd17b696ebd69b30d242c2d3cb (patch) | |
tree | eac38ef931b6c4b8f7d2318c2841ed71a0a8d729 /pkgs/applications/audio/fmit | |
parent | 4dde716a0510b352abf67ed08902422d9ec3b214 (diff) | |
download | nixlib-97d89ad7eee9dcfd17b696ebd69b30d242c2d3cb.tar nixlib-97d89ad7eee9dcfd17b696ebd69b30d242c2d3cb.tar.gz nixlib-97d89ad7eee9dcfd17b696ebd69b30d242c2d3cb.tar.bz2 nixlib-97d89ad7eee9dcfd17b696ebd69b30d242c2d3cb.tar.lz nixlib-97d89ad7eee9dcfd17b696ebd69b30d242c2d3cb.tar.xz nixlib-97d89ad7eee9dcfd17b696ebd69b30d242c2d3cb.tar.zst nixlib-97d89ad7eee9dcfd17b696ebd69b30d242c2d3cb.zip |
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 <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/applications/audio/fmit')
-rw-r--r-- | pkgs/applications/audio/fmit/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 21d1d0ef4c67..c27e049a4ae1 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; |