Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 06849c309061
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: aeb406dd1bb4
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 29, 2020

  1. Only call grantpt on MacOS systems 

    The commit 3cc1125 adds a `grantpt`
call on the builder pseudo terminal fd. This call is actually only
required for MacOS, but it however requires a RW access to /dev/pts
which is only RO bindmounted in the Bazel Linux sandbox. So, Nix can
not be actually run in the Bazel Linux sandbox for unneeded reasons.
    @nlewo
    nlewo committed Apr 29, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    dywedir Vlad M.
    GPG key ID: 3B1AD98E3D65BD4D
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ca93b26 View commit details

  2. Merge pull request #3547 from nlewo/grantpt 

    Only call grantpt on MacOS systems
    @edolstra
    edolstra authored Apr 29, 2020
    Copy the full SHA
    aeb406d View commit details
Showing with 4 additions and 1 deletion.
  1. +4 −1 src/libstore/build.cc
5 changes: 4 additions & 1 deletion src/libstore/build.cc
View file
Original file line number Diff line number Diff line change
@@ -2250,10 +2250,13 @@ void DerivationGoal::startBuilder()

if (chown(slaveName.c_str(), buildUser->getUID(), 0))
throw SysError("changing owner of pseudoterminal slave");
} else {
}
#if __APPLE__
else {
if (grantpt(builderOut.readSide.get()))
throw SysError("granting access to pseudoterminal slave");
}
#endif

#if 0
// Mount the pt in the sandbox so that the "tty" command works.