From 4166b11a53f16365f9becfa4f29f15047fc221af Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 11 Nov 2008 14:59:20 +0000 Subject: * Add /dev/pts to the default nix.conf. --- src/libstore/build.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/libstore') diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 586e44922197..3cd281fc839f 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -1744,15 +1744,14 @@ void DerivationGoal::startBuilder() autoDelChrootTmp = boost::shared_ptr(new AutoDelete(chrootTmpDir)); /* Bind-mount a user-configurable set of directories from the - host file system. */ + host file system. The `/dev/pts' directory must be mounted + separately so that newly-created pseudo-terminals show + up. */ Paths defaultDirs; defaultDirs.push_back("/dev"); - - /* The `/dev/pts' directory must be mounted separately so that - newly-created pseudo-terminals show up. */ defaultDirs.push_back("/dev/pts"); - defaultDirs.push_back("/proc"); + Paths dirsInChroot = querySetting("build-chroot-dirs", defaultDirs); dirsInChroot.push_front(nixStore); -- cgit 1.4.1