From 889bf6bfd8b6424e6bb6e510de8303f8b7c6d08f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 2 Jun 2009 19:07:50 +0000 Subject: [PATCH] Made the setup-hook more friendly to packages which use qt4 more normally (that is, they are aware that the header files are in $QTDIR/include/*/) svn path=/nixpkgs/trunk/; revision=15827 --- pkgs/development/libraries/qt-4/setup-hook.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-4/setup-hook.sh b/pkgs/development/libraries/qt-4/setup-hook.sh index 9fff6e9c8ef5..6e0bbfe7f45f 100644 --- a/pkgs/development/libraries/qt-4/setup-hook.sh +++ b/pkgs/development/libraries/qt-4/setup-hook.sh @@ -1,5 +1,10 @@ export QTDIR=@out@ -for d in @out@/include/*; do - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$d" -done +if [ -z "$normalQt" ]; then + # This helps for g++, but not for moc. And no qt4 package should expect + # having all qt4 header files dirs into -I. But the KDE nix expressions want + # this. + for d in @out@/include/*; do + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$d" + done +fi