diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2024-03-22 22:41:50 +0100 |
|---|---|---|
| committer | K900 <me@0upti.me> | 2024-06-24 11:30:32 +0300 |
| commit | d86009bd76ae85e56e1d26aab26d38f90ecb6439 (patch) | |
| tree | 99a2396cc247c9857bf896910a74b4aa2f51321e /src/libstore/globals.cc | |
| parent | 4c3d93611f2848c56ebc69c85f2b1e18001ed3c7 (diff) | |
Add build-dir setting, clean up default TMPDIR handling
This is a squash of upstream PRs #10303, #10312 and #10883.
fix: Treat empty TMPDIR as unset
Fixes an instance of
nix: src/libutil/util.cc:139: nix::Path nix::canonPath(PathView, bool): Assertion `path != ""' failed.
... which I've been getting in one of my shells for some reason.
I have yet to find out why TMPDIR was empty, but it's no reason for
Nix to break.
(cherry picked from commit c3fb2aa1f9d1fa756dac38d3588c836c5a5395dc)
fix: Treat empty XDG_RUNTIME_DIR as unset
See preceding commit. Not observed in the wild, but is sensible
and consistent with TMPDIR behavior.
(cherry picked from commit b9e7f5aa2df3f0e223f5c44b8089cbf9b81be691)
local-derivation-goal.cc: Reuse defaultTempDir()
(cherry picked from commit fd31945742710984de22805ee8d97fbd83c3f8eb)
fix: remove usage of XDG_RUNTIME_DIR for TMP
(cherry picked from commit 1363f51bcb24ab9948b7b5093490a009947f7453)
tests/functional: Add count()
(cherry picked from commit 6221770c9de4d28137206bdcd1a67eea12e1e499)
Remove uncalled for message
(cherry picked from commit b1fe388d33530f0157dcf9f461348b61eda13228)
Add build-dir setting
(cherry picked from commit 8b16cced18925aa612049d08d5e78eccbf0530e4)
Change-Id: Ic7b75ff0b6a3b19e50a4ac8ff2d70f15c683c16a
Diffstat (limited to 'src/libstore/globals.cc')
| -rw-r--r-- | src/libstore/globals.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index 763dc9158..02d26e034 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -429,7 +429,7 @@ void initLibStore() { /* On macOS, don't use the per-session TMPDIR (as set e.g. by sshd). This breaks build users because they don't have access to the TMPDIR, in particular in ‘nix-store --serve’. */ - if (getEnv("TMPDIR").value_or("/tmp").starts_with("/var/folders/")) + if (defaultTempDir().starts_with("/var/folders/")) unsetenv("TMPDIR"); #endif |