wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-08 19:23:54 +02:00
Code Activity

Don't rely on __noChroot for corepkgs

Browse source 
This doesn't work anymore if the "strict" chroot mode is
enabled. Instead, add Nix's store path as a dependency. This ensures
that its closure is present in the chroot.
This commit is contained in:
Eelco Dolstra 2015-03-24 11:15:45 +01:00
parent b005e63ccf
commit 6f0c6e20e0
6 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
corepkgs/fetchurl.nix
View file

@ -14,7 +14,7 @@ let
'' + (if executable then "${coreutils}/chmod +x $out" else ""));
in
derivation {
name = baseNameOf (toString url);
builder = shell;
@ -26,15 +26,12 @@ derivation {
outputHash = if outputHash != "" then outputHash else
if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5;
outputHashMode = if executable then "recursive" else "flat";
inherit system url;
# No need to double the amount of network traffic
preferLocalBuild = true;
# Don't build in a chroot because Nix's dependencies may not be there.
__noChroot = true;
impureEnvVars = [
# We borrow these environment variables from the caller to allow
# easy proxy configuration. This is impure, but a fixed-output
@ -42,4 +39,6 @@ derivation {
# by definition pure.
"http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
];
inherit chrootDeps;
}