diff options
| author | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2006-08-27 12:52:06 +0000 |
|---|---|---|
| committer | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2006-08-27 12:52:06 +0000 |
| commit | 5634042fa9eb57579d6eee45b25d6264be95593f (patch) | |
| tree | 1b13875921928f357b87133a53a6432b4a397f05 /pkgs/stdenv/mingw | |
| parent | 1838237d25506fbe91fd7ec47c8b149b1a760cf0 (diff) | |
| download | nixlib-5634042fa9eb57579d6eee45b25d6264be95593f.tar nixlib-5634042fa9eb57579d6eee45b25d6264be95593f.tar.gz nixlib-5634042fa9eb57579d6eee45b25d6264be95593f.tar.bz2 nixlib-5634042fa9eb57579d6eee45b25d6264be95593f.tar.lz nixlib-5634042fa9eb57579d6eee45b25d6264be95593f.tar.xz nixlib-5634042fa9eb57579d6eee45b25d6264be95593f.tar.zst nixlib-5634042fa9eb57579d6eee45b25d6264be95593f.zip | |
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
Diffstat (limited to 'pkgs/stdenv/mingw')
| -rwxr-xr-x | pkgs/stdenv/mingw/fix-builder.sh | 1 | ||||
| -rwxr-xr-x | pkgs/stdenv/mingw/pkgs/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/stdenv/mingw/pkgs/pkgconfig-builder.sh | 8 |
3 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/stdenv/mingw/fix-builder.sh b/pkgs/stdenv/mingw/fix-builder.sh index 63050ad3d489..09d933bd17b2 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 d778c5f9a19c..27a4a032c5f6 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 000000000000..c7f456951e3f --- /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 |