3 files changed, 17 insertions, 9 deletions
diff --git a/pkgs/development/tools/misc/pkgconfig/builder.sh b/pkgs/development/tools/misc/pkgconfig/builder.sh
new file mode 100644
index 000000000000..6d281da71e4d
--- /dev/null
+++ b/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
+
diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix
index 481d2174ebc1..be8c4febe03a 100644
--- a/pkgs/development/tools/misc/pkgconfig/default.nix
+++ b/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.
diff --git a/pkgs/development/tools/misc/pkgconfig/setup-hook.sh b/pkgs/development/tools/misc/pkgconfig/setup-hook.sh
index f13a44eb9995..f9e7805ccbf7 100644
--- a/pkgs/development/tools/misc/pkgconfig/setup-hook.sh
+++ b/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)