diff options
| author | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2006-08-26 20:11:31 +0000 |
|---|---|---|
| committer | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2006-08-26 20:11:31 +0000 |
| commit | 961b20c1b7bc6894f0ca0d834cc518aabc7d2d5c (patch) | |
| tree | c8c551b42ad8049455e6aac284af1fb9051688cf /pkgs/stdenv/mingw | |
| parent | ea7977eb84635a46c478957fd55cf4e043fb9572 (diff) | |
| download | nixpkgs-961b20c1b7bc6894f0ca0d834cc518aabc7d2d5c.tar nixpkgs-961b20c1b7bc6894f0ca0d834cc518aabc7d2d5c.tar.gz nixpkgs-961b20c1b7bc6894f0ca0d834cc518aabc7d2d5c.tar.bz2 nixpkgs-961b20c1b7bc6894f0ca0d834cc518aabc7d2d5c.tar.lz nixpkgs-961b20c1b7bc6894f0ca0d834cc518aabc7d2d5c.tar.xz nixpkgs-961b20c1b7bc6894f0ca0d834cc518aabc7d2d5c.tar.zst nixpkgs-961b20c1b7bc6894f0ca0d834cc518aabc7d2d5c.zip | |
Added pre release of stratego libraries, fixed support for configureFlags in MinGW, add binary pkg-config distribution for bootstrapping. Optionally use pkgconfig from the stdenv (again, for bootstrapping)
svn path=/nixpkgs/trunk/; revision=6253
Diffstat (limited to 'pkgs/stdenv/mingw')
| -rw-r--r-- | pkgs/stdenv/mingw/default.nix | 11 | ||||
| -rwxr-xr-x | pkgs/stdenv/mingw/fix-builder.sh | 1 | ||||
| -rwxr-xr-x | pkgs/stdenv/mingw/pkgs/default.nix | 20 |
3 files changed, 31 insertions, 1 deletions
diff --git a/pkgs/stdenv/mingw/default.nix b/pkgs/stdenv/mingw/default.nix index 8bfb40e386e..1813c4feb76 100644 --- a/pkgs/stdenv/mingw/default.nix +++ b/pkgs/stdenv/mingw/default.nix @@ -59,7 +59,10 @@ let { stdenvFinal = let { body = - stdenv // mkDerivationFun // { inherit fetchurl; }; + stdenv // mkDerivationFun // { + inherit fetchurl; + pkgconfig = pkgconfigBin; + }; shell = msys + /bin/sh + ".exe"; @@ -202,6 +205,12 @@ let { inherit fetchurl; }; + pkgconfigBin = + (import ./pkgs).pkgconfigBin { + stdenv = stdenvInit3; + inherit fetchurl; + }; + /** * Source packages, based on stdenvInit3 */ diff --git a/pkgs/stdenv/mingw/fix-builder.sh b/pkgs/stdenv/mingw/fix-builder.sh index 42c41dc3283..70ec712f907 100755 --- a/pkgs/stdenv/mingw/fix-builder.sh +++ b/pkgs/stdenv/mingw/fix-builder.sh @@ -10,6 +10,7 @@ if test -z "$out"; then succeedOnFailure=$SUCCEEDONFAILURE patches=$PATCHES doCheck=$DOCHECK + configureFlags=$CONFIGUREFLAGS fi source $@ diff --git a/pkgs/stdenv/mingw/pkgs/default.nix b/pkgs/stdenv/mingw/pkgs/default.nix index fb4fb10cbc2..d778c5f9a19 100755 --- a/pkgs/stdenv/mingw/pkgs/default.nix +++ b/pkgs/stdenv/mingw/pkgs/default.nix @@ -114,6 +114,26 @@ rec { }; }; + /** + * We need a binary pkg-config to bootstrap the compilation of + * glib and pkg-config: pkg-config needs glib, glib needs pkg-config. + * + * This tarball contains pkg-config and all its dependencies. Once we + * have bootstrapped pkg-config we really need to use a statically linked + * pkg-config (and provide this .exe at the web: it is really missing + * on the web). + */ + pkgconfigBin = {stdenv, fetchurl} : + stdenv.mkDerivation { + name = "pkg-config-0.20"; + builder = ./bin-builder.sh; + src = + fetchurl { + url = http://www.cs.uu.nl/people/martin/pkg-config-0.20-bin.tar.gz; + md5 = "71f9595a022619b8e8b0f7853790c4c7"; + }; + }; + /* pkgs.coreutils pkgs.findutils |