macs: unpin nix
Martin Weinelt committed
Dec 4, 2025 at 17:46 UTC
1d4cbb7de77368522586d89b167a849f863c44e4
2 files changed
-23
macs/common.nix
-3
@@ -40,9 +40,6 @@ in
40
};
41
42
nix = {
43
- package = pkgs.nixVersions.nix_2_24.overrideAttrs (oldAttrs: {
44
- patches = oldAttrs.patches or [ ] ++ [ ./disable-chroot.patch ];
45
- });
43
settings = {
44
extra-experimental-features = [
45
"nix-command"
macs/disable-chroot.patch
deleted
-20
@@ -1,20 +0,0 @@
1
-diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
2
-index 2a09e3dd4..baeae54f8 100644
3
---- a/src/libstore/unix/build/local-derivation-goal.cc
4
-+++ b/src/libstore/unix/build/local-derivation-goal.cc
5
-@@ -509,11 +509,11 @@ void LocalDerivationGoal::startBuilder()
6
- /* Create a temporary directory where the build will take
7
- place. */
8
- topTmpDir = createTempDir(settings.buildDir.get().value_or(""), "nix-build-" + std::string(drvPath.name()), false, false, 0700);
9
--#if __APPLE__
10
-+//#if __APPLE__
11
- if (false) {
12
--#else
13
-- if (useChroot) {
14
--#endif
15
-+//#else
16
-+// if (useChroot) {
17
-+//#endif
18
- /* If sandboxing is enabled, put the actual TMPDIR underneath
19
- an inaccessible root-owned directory, to prevent outside
20
- access.