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

@@ -17,6 +17,7 @@ if test -z "$out"; then
   src=$SRC
   srcs=$SRCS
   succeedOnFailure=$SUCCEEDONFAILURE
+  system=$SYSTEM
 fi
 
 source $@

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;

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