From b30f5784d0184688de964f6239e373b62101ebc4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 15 May 2017 17:26:20 +0200
Subject: Linux sandbox: Don't barf on invalid paths

This is useful when we're using a diverted store (e.g. "--store
local?root=/tmp/nix") in conjunction with a statically-linked sh from
the host store (e.g. "sandbox-paths =/bin/sh=/nix/store/.../bin/busybox").
---
 src/libstore/build.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 270500d81c90..5ec4cbf66540 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -1774,6 +1774,7 @@ void DerivationGoal::startBuilder()
             try {
                 if (worker.store.isInStore(i.second.source))
                     worker.store.computeFSClosure(worker.store.toStorePath(i.second.source), closure);
+            } catch (InvalidPath & e) {
             } catch (Error & e) {
                 throw Error(format("while processing ‘build-sandbox-paths’: %s") % e.what());
             }
-- 
cgit 1.4.1