diff options
| author | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2006-08-17 01:25:46 +0000 |
|---|---|---|
| committer | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2006-08-17 01:25:46 +0000 |
| commit | 18d81e23fe022ce9a6f36685e2819f12a1840556 (patch) | |
| tree | 7dd46bd6c84df7c112a31ff243a9e8856f978c40 /pkgs/stdenv/mingw | |
| parent | bda8fc5621b6b0b8c8805b608de1fe1c98912747 (diff) | |
| download | nixlib-18d81e23fe022ce9a6f36685e2819f12a1840556.tar nixlib-18d81e23fe022ce9a6f36685e2819f12a1840556.tar.gz nixlib-18d81e23fe022ce9a6f36685e2819f12a1840556.tar.bz2 nixlib-18d81e23fe022ce9a6f36685e2819f12a1840556.tar.lz nixlib-18d81e23fe022ce9a6f36685e2819f12a1840556.tar.xz nixlib-18d81e23fe022ce9a6f36685e2819f12a1840556.tar.zst nixlib-18d81e23fe022ce9a6f36685e2819f12a1840556.zip | |
Cleanup of various echo and debug messages. Added top-level mingw.nix for use with nix-env, because many asserts are broken all-packages.nix does not work with mingw stdenv.
svn path=/nixpkgs/trunk/; revision=6142
Diffstat (limited to 'pkgs/stdenv/mingw')
| -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 |
3 files changed, 3 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 |