diff options
| author | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2006-08-16 14:15:00 +0000 |
|---|---|---|
| committer | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2006-08-16 14:15:00 +0000 |
| commit | 884b6f9a0daed92f6bf75888ee025f896fdf9021 (patch) | |
| tree | 82ceeaad3dc7584eb841362985bee6c39af92aab /pkgs/stdenv/mingw/default.nix | |
| parent | 5992b95b646c864e1e7d5e53158f4e0a8477abd7 (diff) | |
| download | nixpkgs-884b6f9a0daed92f6bf75888ee025f896fdf9021.tar nixpkgs-884b6f9a0daed92f6bf75888ee025f896fdf9021.tar.gz nixpkgs-884b6f9a0daed92f6bf75888ee025f896fdf9021.tar.bz2 nixpkgs-884b6f9a0daed92f6bf75888ee025f896fdf9021.tar.lz nixpkgs-884b6f9a0daed92f6bf75888ee025f896fdf9021.tar.xz nixpkgs-884b6f9a0daed92f6bf75888ee025f896fdf9021.tar.zst nixpkgs-884b6f9a0daed92f6bf75888ee025f896fdf9021.zip | |
Added make
svn path=/nixpkgs/trunk/; revision=6131
Diffstat (limited to 'pkgs/stdenv/mingw/default.nix')
| -rw-r--r-- | pkgs/stdenv/mingw/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/stdenv/mingw/default.nix b/pkgs/stdenv/mingw/default.nix index 517470bcd81..a60255c46f8 100644 --- a/pkgs/stdenv/mingw/default.nix +++ b/pkgs/stdenv/mingw/default.nix @@ -47,6 +47,8 @@ let { /** * MSYS, installed using stdenvInit1 + * + * @todo Maybe remove the make of msys? */ msys = stdenvInit1.mkDerivation { @@ -71,13 +73,19 @@ let { shell = msys + /bin/sh + ".exe"; + make = + (import ./pkgs).make { + stdenv = stdenvInit2; + inherit fetchurl; + }; + stdenv = stdenvInit2.mkDerivation { name = "stdenv-mingw"; builder = ./builder.sh; substitute = ../../build-support/substitute/substitute.sh; setup = ./setup.sh; - initialPath = [msys]; + initialPath = [make msys]; inherit shell; gcc = msys; # TODO }; |