* Revert the setup hook changes on the trunk (but they remain on the

stdenv-updates branch).

svn path=/nixpkgs/trunk/; revision=9652

pkgs/development/tools/build-managers/cmake/setup-hook.sh

@@ -1,16 +1,15 @@
 addCMakeParamsInclude()
 {
-	addToSearchPath CMAKE_INCLUDE_PATH /include "" $1
+	if [ -d $1/include ]; then
+		export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}${CMAKE_INCLUDE_PATH:+:}$1/include"
+	fi
 }
 
 addCMakeParamsLibs()
 {
-	addToSearchPath CMAKE_LIBRARY_PATH /lib "" $1
-}
-
-addCMakeModulePath()
-{
-	addToSearchPath CMAKE_MODULE_PATH /share/cmake-2.4/Modules "" $1
+	if [ -d $1/lib ]; then
+		export CMAKE_LIBRARY_PATH="${CMAKE_LIBRARY_PATH}${CMAKE_LIBRARY_PATH:+:}$1/lib"
+	fi
 }
 
 fixCmakeFiles()
@@ -46,4 +45,4 @@ if [ -z "$noCmakeTewaks" ]; then
 	postUnpack="cmakePostUnpack${postUnpack:+; }${postUnpack}"
 fi;
 
-envHooks=(${envHooks[@]} addCMakeParamsInclude addCMakeParamsLibs addCMakeModulePath)
+envHooks=(${envHooks[@]} addCMakeParamsInclude addCMakeParamsLibs)

pkgs/development/tools/misc/automake/setup-hook.sh

@@ -1,5 +1,7 @@
 addAclocals () {
-	addToSearchPathWithCustomDelimiter : ACLOCAL_PATH /share/aclocal "" $1
+    if test -d $1/share/aclocal; then
+        export ACLOCAL_PATH="$ACLOCAL_PATH${ACLOCAL_PATH:+:}$1/share/aclocal"
+    fi
 }
 
 envHooks=(${envHooks[@]} addAclocals)

pkgs/development/tools/misc/pkgconfig/builder.sh

@@ -0,0 +1,10 @@
+source $stdenv/setup
+
+postInstall() {
+    test -x $out/nix-support || mkdir $out/nix-support
+    cp $setupHook $out/nix-support/setup-hook
+}
+postInstall=postInstall
+
+genericBuild
+

pkgs/development/tools/misc/pkgconfig/default.nix

@@ -1,18 +1,14 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "pkgconfig-0.22";
+  name = "pkgconfig-0.21";
+  builder = ./builder.sh;
   setupHook = ./setup-hook.sh;
   src = fetchurl {
-    url = http://pkgconfig.freedesktop.org/releases/pkg-config-0.22.tar.gz;
-	sha256 = "1rpb5wygmp0f8nal7y3ga4556i7hkjdslv3wdq04fj30gns621vy";
+    url = http://nix.cs.uu.nl/dist/tarballs/pkg-config-0.21.tar.gz;
+    md5 = "476f45fab1504aac6697aa7785f0ab91";
   };
 
-  postInstall = "
-  ensureDir \$out/nix-support
-  cp \$setupHook \$out/nix-support/setup-hook
-  ";
-
   patches = [
     # Process Requires.private properly, see
     # http://bugs.freedesktop.org/show_bug.cgi?id=4738.

pkgs/development/tools/misc/pkgconfig/setup-hook.sh

@@ -1,5 +1,7 @@
 addPkgConfigPath () {
-	addToSearchPath PKG_CONFIG_PATH /lib/pkgconfig "" $1
+    if test -d $1/lib/pkgconfig; then
+        export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}${PKG_CONFIG_PATH:+:}$1/lib/pkgconfig"
+    fi
 }
 
 envHooks=(${envHooks[@]} addPkgConfigPath)