diff --git a/pkgs/development/tools/misc/pkgconfig/builder.sh b/pkgs/development/tools/misc/pkgconfig/builder.sh
index 5ec940cb03a8..b2b351301626 100755
--- a/pkgs/development/tools/misc/pkgconfig/builder.sh
+++ b/pkgs/development/tools/misc/pkgconfig/builder.sh
@@ -1,10 +1,13 @@
 #! /bin/sh
 
-. $stdenv/setup || exit 1
+. $stdenv/setup
 
-tar xvfz $src || exit 1
-cd pkgconfig-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-mkdir $out || exit 1
-make install || exit 1
+tar xvfz $src
+cd pkgconfig-*
+./configure --prefix=$out
+make
+mkdir $out
+make install
+
+mkdir $out/nix-support
+cp $setupHook $out/nix-support/setup-hook
\ No newline at end of file
diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix
index 9194b0418437..4cd880aad006 100644
--- a/pkgs/development/tools/misc/pkgconfig/default.nix
+++ b/pkgs/development/tools/misc/pkgconfig/default.nix
@@ -1,10 +1,13 @@
-{stdenv, fetchurl}: derivation {
+{stdenv, fetchurl}:
+
+derivation {
   name = "pkgconfig-0.15.0";
   system = stdenv.system;
   builder = ./builder.sh;
+  setupHook = ./setup-hook.sh;
   src = fetchurl {
     url = http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-0.15.0.tar.gz;
     md5 = "a7e4f60a6657dbc434334deb594cc242";
   };
-  stdenv = stdenv;
+  inherit stdenv;
 }
diff --git a/pkgs/development/tools/misc/pkgconfig/setup-hook.sh b/pkgs/development/tools/misc/pkgconfig/setup-hook.sh
new file mode 100644
index 000000000000..f9e7805ccbf7
--- /dev/null
+++ b/pkgs/development/tools/misc/pkgconfig/setup-hook.sh
@@ -0,0 +1,7 @@
+addPkgConfigPath () {
+    if test -d $1/lib/pkgconfig; then
+        export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}${PKG_CONFIG_PATH:+:}$1/lib/pkgconfig"
+    fi
+}
+
+envHooks=(${envHooks[@]} addPkgConfigPath)