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
This commit is contained in:
parent
bda8fc5621
commit
18d81e23fe
@ -79,6 +79,7 @@ let {
|
|||||||
gcc = gccCore;
|
gcc = gccCore;
|
||||||
shell = msysShell;
|
shell = msysShell;
|
||||||
inherit curl;
|
inherit curl;
|
||||||
|
isDarwin = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
mkDerivationFun = {
|
mkDerivationFun = {
|
||||||
|
@ -15,7 +15,6 @@ if test -z "$out"; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
header "downloading $out from $url"
|
header "downloading $out from $url"
|
||||||
echo "curl is $curl"
|
|
||||||
$curl --fail --location --max-redirs 20 "$url" > "$out"
|
$curl --fail --location --max-redirs 20 "$url" > "$out"
|
||||||
|
|
||||||
if test "$NIX_OUTPUT_CHECKED" != "1"; then
|
if test "$NIX_OUTPUT_CHECKED" != "1"; then
|
||||||
@ -30,7 +29,6 @@ if test "$NIX_OUTPUT_CHECKED" != "1"; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "chmod is $chmod"
|
|
||||||
$chmod a-x $out
|
$chmod a-x $out
|
||||||
|
|
||||||
stopNest
|
stopNest
|
||||||
|
@ -26,10 +26,10 @@ else
|
|||||||
cd $NIX_BUILD_TOP
|
cd $NIX_BUILD_TOP
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# if test "$NIX_DEBUG" = "1"; then
|
if test "$NIX_DEBUG" = "1"; then
|
||||||
echo "Initial path: $PATH"
|
echo "Initial path: $PATH"
|
||||||
echo "$buildInputs"
|
echo "$buildInputs"
|
||||||
# fi
|
fi
|
||||||
|
|
||||||
# Execute the pre-hook.
|
# Execute the pre-hook.
|
||||||
export SHELL=@SHELL@
|
export SHELL=@SHELL@
|
||||||
@ -211,8 +211,6 @@ trap "closeNest" EXIT
|
|||||||
# then go to the build directory and source in `env-vars' to reproduce
|
# then go to the build directory and source in `env-vars' to reproduce
|
||||||
# the environment used for building.
|
# the environment used for building.
|
||||||
dumpVars() {
|
dumpVars() {
|
||||||
pwd
|
|
||||||
ls
|
|
||||||
if test "$noDumpEnvVars" != "1"; then
|
if test "$noDumpEnvVars" != "1"; then
|
||||||
export > $NIX_BUILD_TOP/env-vars
|
export > $NIX_BUILD_TOP/env-vars
|
||||||
fi
|
fi
|
||||||
|
10
pkgs/top-level/mingw.nix
Executable file
10
pkgs/top-level/mingw.nix
Executable file
@ -0,0 +1,10 @@
|
|||||||
|
let {
|
||||||
|
pkgs =
|
||||||
|
import ./all-packages.nix {
|
||||||
|
system = "i686-mingw";
|
||||||
|
};
|
||||||
|
|
||||||
|
body = {
|
||||||
|
inherit (pkgs) zlib;
|
||||||
|
};
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user