From 5634042fa9eb57579d6eee45b25d6264be95593f Mon Sep 17 00:00:00 2001
From: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Sun, 27 Aug 2006 12:52:06 +0000
Subject: [PATCH] M    stdenv/mingw/pkgs/default.nix A   
 stdenv/mingw/pkgs/pkgconfig-builder.sh

Bootstrap pkg-config: support the setup hook.

M    stdenv/mingw/fix-builder.sh

Fix the "system" variable.


svn path=/nixpkgs/trunk/; revision=6267
---
 pkgs/stdenv/mingw/fix-builder.sh            | 1 +
 pkgs/stdenv/mingw/pkgs/default.nix          | 5 +++--
 pkgs/stdenv/mingw/pkgs/pkgconfig-builder.sh | 8 ++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/stdenv/mingw/pkgs/pkgconfig-builder.sh

diff --git a/pkgs/stdenv/mingw/fix-builder.sh b/pkgs/stdenv/mingw/fix-builder.sh
index 63050ad3d48..09d933bd17b 100755
--- a/pkgs/stdenv/mingw/fix-builder.sh
+++ b/pkgs/stdenv/mingw/fix-builder.sh
@@ -17,6 +17,7 @@ if test -z "$out"; then
   src=$SRC
   srcs=$SRCS
   succeedOnFailure=$SUCCEEDONFAILURE
+  system=$SYSTEM
 fi
 
 source $@
diff --git a/pkgs/stdenv/mingw/pkgs/default.nix b/pkgs/stdenv/mingw/pkgs/default.nix
index d778c5f9a19..27a4a032c5f 100755
--- a/pkgs/stdenv/mingw/pkgs/default.nix
+++ b/pkgs/stdenv/mingw/pkgs/default.nix
@@ -125,8 +125,9 @@ rec {
    */
   pkgconfigBin =  {stdenv, fetchurl} :
     stdenv.mkDerivation {
-      name = "pkg-config-0.20";
-      builder = ./bin-builder.sh;
+      name = "pkgconfig-0.20";
+      builder = ./pkgconfig-builder.sh;
+      setupHook = ../../../development/tools/misc/pkgconfig/setup-hook.sh;
       src =
         fetchurl {
           url = http://www.cs.uu.nl/people/martin/pkg-config-0.20-bin.tar.gz;
diff --git a/pkgs/stdenv/mingw/pkgs/pkgconfig-builder.sh b/pkgs/stdenv/mingw/pkgs/pkgconfig-builder.sh
new file mode 100644
index 00000000000..c7f456951e3
--- /dev/null
+++ b/pkgs/stdenv/mingw/pkgs/pkgconfig-builder.sh
@@ -0,0 +1,8 @@
+source $STDENV/setup
+
+mkdir $OUT
+cd $OUT
+tar zxvf $SRC
+
+test -x $OUT/nix-support || mkdir $OUT/nix-support
+cp $SETUPHOOK $OUT/nix-support/setup-hook