Merge pull request #11366 from Mic92/homeless-shelter

Revert: Make $HOME=/proc/homeless-shelter instead of /homeless-shelter
NixOS · Aug 25, 2024 · a30eb6d · a30eb6d
2 parents 85f1aa6 + 90560ee
commit a30eb6d
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 18 deletions.
diff --git a/doc/manual/rl-next/homeless-shelter-to-proc.md b/doc/manual/rl-next/homeless-shelter-to-proc.md
diff --git a/doc/manual/src/language/derivations.md b/doc/manual/src/language/derivations.md
@@ -264,8 +264,7 @@ The [`builder`](#attr-builder) is executed as follows:
   - `PATH` is set to `/path-not-set` to prevent shells from
     initialising it to their built-in default value.
 
-  - `HOME` is set to `/proc/homeless-shelter` on Linux and `/homeless-shelter`
-    on OSX, to prevent programs from
+  - `HOME` is set to `/homeless-shelter` to prevent programs from
     using `/etc/passwd` or the like to find the user's home
     directory, which could cause impurity. Usually, when `HOME` is
     set, it is used as the location of the home directory, even if

diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
@@ -102,14 +102,7 @@ void handleDiffHook(
     }
 }
 
-// We want $HOME to be un-creatable in the sandbox. On Linux,
-// you can't create anything inside /proc since it's a virtual filesystem.
-// On Darwin it seems that `/homeless-shelter` is good enough.
-#if __linux__
-const Path LocalDerivationGoal::homeDir = "/proc/homeless-shelter";
-#else
 const Path LocalDerivationGoal::homeDir = "/homeless-shelter";
-#endif
 
 
 LocalDerivationGoal::~LocalDerivationGoal()