diff options
| -rw-r--r-- | pkgs/stdenv/mingw/default.nix | 1 | ||||
| -rwxr-xr-x | pkgs/stdenv/mingw/fetchurl/builder.sh | 2 | ||||
| -rwxr-xr-x | pkgs/stdenv/mingw/setup.sh | 6 | ||||
| -rwxr-xr-x | pkgs/top-level/mingw.nix | 10 |
4 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/stdenv/mingw/default.nix b/pkgs/stdenv/mingw/default.nix index 05542321d8f6..d7caa744730c 100644 --- a/pkgs/stdenv/mingw/default.nix +++ b/pkgs/stdenv/mingw/default.nix @@ -79,6 +79,7 @@ let { gcc = gccCore; shell = msysShell; inherit curl; + isDarwin = false; }; mkDerivationFun = { diff --git a/pkgs/stdenv/mingw/fetchurl/builder.sh b/pkgs/stdenv/mingw/fetchurl/builder.sh index fb1386285b69..e9f2669a097f 100755 --- a/pkgs/stdenv/mingw/fetchurl/builder.sh +++ b/pkgs/stdenv/mingw/fetchurl/builder.sh @@ -15,7 +15,6 @@ if test -z "$out"; then fi header "downloading $out from $url" -echo "curl is $curl" $curl --fail --location --max-redirs 20 "$url" > "$out" if test "$NIX_OUTPUT_CHECKED" != "1"; then @@ -30,7 +29,6 @@ if test "$NIX_OUTPUT_CHECKED" != "1"; then fi fi -echo "chmod is $chmod" $chmod a-x $out stopNest diff --git a/pkgs/stdenv/mingw/setup.sh b/pkgs/stdenv/mingw/setup.sh index 8e144a26139d..9d53f487540d 100755 --- a/pkgs/stdenv/mingw/setup.sh +++ b/pkgs/stdenv/mingw/setup.sh @@ -26,10 +26,10 @@ else cd $NIX_BUILD_TOP fi -# if test "$NIX_DEBUG" = "1"; then +if test "$NIX_DEBUG" = "1"; then echo "Initial path: $PATH" echo "$buildInputs" -# fi +fi # Execute the pre-hook. export SHELL=@SHELL@ @@ -211,8 +211,6 @@ trap "closeNest" EXIT # then go to the build directory and source in `env-vars' to reproduce # the environment used for building. dumpVars() { - pwd - ls if test "$noDumpEnvVars" != "1"; then export > $NIX_BUILD_TOP/env-vars fi diff --git a/pkgs/top-level/mingw.nix b/pkgs/top-level/mingw.nix new file mode 100755 index 000000000000..a95e146b003b --- /dev/null +++ b/pkgs/top-level/mingw.nix @@ -0,0 +1,10 @@ +let { + pkgs = + import ./all-packages.nix { + system = "i686-mingw"; + }; + + body = { + inherit (pkgs) zlib; + }; +} |