diff options
| author | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2006-08-16 19:13:43 +0000 |
|---|---|---|
| committer | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2006-08-16 19:13:43 +0000 |
| commit | 44f6c2ef74ecbe89d1a6c5be7e9f7faa2c981578 (patch) | |
| tree | ff15e12d9a9ceca330bcc35c06dc95c2cd8365ff /pkgs/stdenv/mingw | |
| parent | d1f3a668a018f13199947b7e839309dad12ec8a6 (diff) | |
| download | nixlib-44f6c2ef74ecbe89d1a6c5be7e9f7faa2c981578.tar nixlib-44f6c2ef74ecbe89d1a6c5be7e9f7faa2c981578.tar.gz nixlib-44f6c2ef74ecbe89d1a6c5be7e9f7faa2c981578.tar.bz2 nixlib-44f6c2ef74ecbe89d1a6c5be7e9f7faa2c981578.tar.lz nixlib-44f6c2ef74ecbe89d1a6c5be7e9f7faa2c981578.tar.xz nixlib-44f6c2ef74ecbe89d1a6c5be7e9f7faa2c981578.tar.zst nixlib-44f6c2ef74ecbe89d1a6c5be7e9f7faa2c981578.zip | |
Build the mingw w32api from source for the mingw stdenv
svn path=/nixpkgs/trunk/; revision=6137
Diffstat (limited to 'pkgs/stdenv/mingw')
| -rw-r--r-- | pkgs/stdenv/mingw/default.nix | 8 | ||||
| -rwxr-xr-x | pkgs/stdenv/mingw/pkgs/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/stdenv/mingw/pkgs/src-builder.sh (renamed from pkgs/stdenv/mingw/pkgs/mingw-runtime-builder.sh) | 6 |
3 files changed, 19 insertions, 7 deletions
diff --git a/pkgs/stdenv/mingw/default.nix b/pkgs/stdenv/mingw/default.nix index 8d75fdd063fb..589534604915 100644 --- a/pkgs/stdenv/mingw/default.nix +++ b/pkgs/stdenv/mingw/default.nix @@ -85,7 +85,7 @@ let { builder = ./builder.sh; substitute = ../../build-support/substitute/substitute.sh; setup = ./setup.sh; - initialPath = [mingwRuntimeSrc make msys]; + initialPath = [mingwRuntimeSrc w32apiSrc make msys]; gcc = gccWrapper; shell = msysShell; }; @@ -181,4 +181,10 @@ let { stdenv = stdenvInit3; inherit fetchurl; }; + + w32apiSrc = + (import ./pkgs).w32apiSrc { + stdenv = stdenvInit3; + inherit fetchurl; + }; } diff --git a/pkgs/stdenv/mingw/pkgs/default.nix b/pkgs/stdenv/mingw/pkgs/default.nix index cb47e737424b..00e0fd87cfb6 100755 --- a/pkgs/stdenv/mingw/pkgs/default.nix +++ b/pkgs/stdenv/mingw/pkgs/default.nix @@ -59,7 +59,7 @@ rec { mingwRuntimeSrc = {stdenv, fetchurl} : stdenv.mkDerivation { name = "mingw-runtime-3.10"; - builder = ./mingw-runtime-builder.sh; + builder = ./src-builder.sh; src = fetchurl { url = http://surfnet.dl.sourceforge.net/sourceforge/mingw/mingw-runtime-3.10-src.tar.gz; @@ -78,6 +78,16 @@ rec { }; }; + w32apiSrc = {stdenv, fetchurl} : + stdenv.mkDerivation { + name = "w32api-3.7"; + builder = ./src-builder.sh; + src = + fetchurl { + url = http://surfnet.dl.sourceforge.net/sourceforge/mingw/w32api-3.7-src.tar.gz; + md5 = "d799c407b4c1b480d0339994d01f355d"; + }; + }; /* pkgs.coreutils diff --git a/pkgs/stdenv/mingw/pkgs/mingw-runtime-builder.sh b/pkgs/stdenv/mingw/pkgs/src-builder.sh index 225d3e4d608c..09dbb152772a 100644 --- a/pkgs/stdenv/mingw/pkgs/mingw-runtime-builder.sh +++ b/pkgs/stdenv/mingw/pkgs/src-builder.sh @@ -1,11 +1,7 @@ source $STDENV/setup tar zxvf $SRC -cd mingw-runtime-* +cd $NAME ./configure --prefix=$OUT make make install - - - - |