picnoir
/
nix-gh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'host-deps' of git://github.com/pikajude/nix 

Reintroduces the functionality that allows the baked-in pre-build-hook to find framework dependencies
This commit is contained in:
Shea Levy 2015-11-21 20:28:13 -05:00
parent e0bd114e09 279fa8f618
commit 6c10bd7c5e
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release.nix
View File

@ -97,7 +97,7 @@ let
enableParallelBuilding = true;
__sandboxProfile = lib.sandbox.allowFileRead [
sandboxProfile = lib.sandbox.allowFileRead [
"/etc" "/etc/nix/nix.conf" "/private/etc/nix/nix.conf"
];

2
scripts/resolve-system-dependencies.pl.in
View File

@ -113,7 +113,7 @@ if (defined $ARGV[0]) {
my $depset = reduce { union($a, $b) } (map { resolve_tree($_, $depcache) } @files);
print "extra-chroot-dirs\n";
print join("\n", keys %$depset);
print "\n\n";
print "\n";
}
lock_store($DEPS, $cache);
} else {

3
src/libstore/build.cc
View File

@ -1927,7 +1927,7 @@ void DerivationGoal::startBuilder()
#if SANDBOX_ENABLED
additionalSandboxProfile = get(drv->env, "__sandboxProfile");
#else
#endif
string allowed = settings.get("allowed-impure-host-deps", string(DEFAULT_ALLOWED_IMPURE_PREFIXES));
PathSet allowedPaths = tokenizeString<StringSet>(allowed);
@ -1953,7 +1953,6 @@ void DerivationGoal::startBuilder()
dirsInChroot[i] = i;
}
#endif
#if CHROOT_ENABLED
/* Create a temporary directory in which we set up the chroot