From 38d5c07b1447e807ab4723a271cbfcfece22c3df Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 15 Apr 2016 04:29:28 +0200 Subject: [PATCH] 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 --- pkgs/applications/graphics/rapcad/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 = {