Skip to content

Commit 37685b1

Browse files
edolstraMic92
authored andcommitted
Fix Darwin test failure in repl.sh
Fixes error: … while processing sandbox path '/private/tmp/nix-shell.0MDgyx/nix-test/ca/repl/store/nix/var/nix/builds/nix-build-simple.drv-65916-3910734210' (/private/tmp/nix-shell.0MDgyx/nix-test/ca/repl/store) error: 'nix' is too short to be a valid store path which happened because we were now putting the build directory underneath the store directory.
1 parent 2e2fe4c commit 37685b1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/libstore/unix/build/derivation-builder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,7 @@ DerivationBuilderImpl::PathsInChroot DerivationBuilderImpl::getPathsInSandbox()
922922
store.computeFSClosure(store.toStorePath(i.second.source).first, closure);
923923
} catch (InvalidPath & e) {
924924
} catch (Error & e) {
925-
e.addTrace({}, "while processing 'sandbox-paths'");
925+
e.addTrace({}, "while processing sandbox path '%s'", i.second.source);
926926
throw;
927927
}
928928
for (auto & i : closure) {

tests/functional/repl.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ testRepl () {
6767
# Simple test, try building a drv
6868
testRepl
6969
# Same thing (kind-of), but with a remote store.
70-
testRepl --store "$TEST_ROOT/store?real=$NIX_STORE_DIR"
70+
testRepl --store "$TEST_ROOT/other-root?real=$NIX_STORE_DIR"
7171

7272
# Remove ANSI escape sequences. They can prevent grep from finding a match.
7373
stripColors () {

0 commit comments

Comments
 (0)