diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-04-15 04:29:28 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-04-15 05:26:02 +0200 |
| commit | 38d5c07b1447e807ab4723a271cbfcfece22c3df (patch) | |
| tree | c01d43b9ecdf63717b5c764f23bbd9234108e969 /pkgs/applications | |
| parent | a0dd8d5afed35629c1055661d9262c64fc472402 (diff) | |
| download | nixpkgs-38d5c07b1447e807ab4723a271cbfcfece22c3df.tar nixpkgs-38d5c07b1447e807ab4723a271cbfcfece22c3df.tar.gz nixpkgs-38d5c07b1447e807ab4723a271cbfcfece22c3df.tar.bz2 nixpkgs-38d5c07b1447e807ab4723a271cbfcfece22c3df.tar.lz nixpkgs-38d5c07b1447e807ab4723a271cbfcfece22c3df.tar.xz nixpkgs-38d5c07b1447e807ab4723a271cbfcfece22c3df.tar.zst nixpkgs-38d5c07b1447e807ab4723a271cbfcfece22c3df.zip | |
rapcad: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right qmake path. Unfortunately the mkDerivation attributes of rapcad override the whole configurePhase, so this hook isn't run at all. However, this still doesn't fix the build of rapcad, because it's unable to find GL/glu.h. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/graphics/rapcad/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix index cb92947b766..90cb360e7d5 100644 --- a/pkgs/applications/graphics/rapcad/default.nix +++ b/pkgs/applications/graphics/rapcad/default.nix @@ -15,8 +15,10 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline ]; configurePhase = '' - qmake; + runHook preConfigure + qmake sed -e "s@/usr/@$out/@g" -i $(find . -name Makefile) + runHook postConfigure ''; meta = { |