diff options
| author | Shea Levy <shea@shealevy.com> | 2015-11-22T01·28-0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2015-11-22T01·28-0500 |
| commit | 6c10bd7c5e946424996e3628e74ba433207aa90e (patch) | |
| tree | f422c3d1c167e78abc7a68b23f20521e376e1459 | |
| parent | e0bd114e099810b58385142f1347891e3074a1ec (diff) | |
| parent | 279fa8f618ff22cc71bf902a65cc29c04af6e01f (diff) | |
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
| -rw-r--r-- | release.nix | 2 | ||||
| -rwxr-xr-x | scripts/resolve-system-dependencies.pl.in | 2 | ||||
| -rw-r--r-- | src/libstore/build.cc | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/release.nix b/release.nix index 8935cfa19680..0ee75e9a8b76 100644 --- a/release.nix +++ b/release.nix @@ -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" ]; diff --git a/scripts/resolve-system-dependencies.pl.in b/scripts/resolve-system-dependencies.pl.in index 23416b75c023..a20f0dc020fe 100755 --- a/scripts/resolve-system-dependencies.pl.in +++ b/scripts/resolve-system-dependencies.pl.in @@ -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 { diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 9614bb1c3eb2..81ef701b0c13 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -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 |