Revert "nixos: Introduce nix.buildLocation option"

This reverts commit 5291925fd2.
Reason: This started to cause severe regressions, see:
- https://github.com/NixOS/nixpkgs/issues/85552
- https://github.com/NixOS/nixpkgs/pull/83166#pullrequestreview-395960588
Fixes #85552.
This commit is contained in:
Michael Weiss 2020-04-19 15:03:37 +02:00
parent a0e496acd0
commit 0e4417f118
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
1 changed files with 1 additions and 15 deletions

View File

@ -430,16 +430,6 @@ in
''; '';
}; };
buildLocation = mkOption {
type = types.str;
default = "/tmp";
example = "/var/buildroot";
description = ''
Temporary directory, which used to unpack and build source packages.
(by default <filename>/tmp</filename> is used, which commonly reside on tmpfs,
and big packages (like browsers) can just not fit there)
'';
};
}; };
}; };
@ -486,9 +476,7 @@ in
++ optionals cfg.distributedBuilds [ pkgs.gzip ]; ++ optionals cfg.distributedBuilds [ pkgs.gzip ];
environment = cfg.envVars environment = cfg.envVars
// { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt"; // { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt"; }
TMPDIR = cfg.buildLocation;
}
// config.networking.proxy.envVars; // config.networking.proxy.envVars;
unitConfig.RequiresMountsFor = "/nix/store"; unitConfig.RequiresMountsFor = "/nix/store";
@ -502,8 +490,6 @@ in
restartTriggers = [ nixConf ]; restartTriggers = [ nixConf ];
}; };
systemd.tmpfiles.rules = [ "d ${cfg.buildLocation} 0775 root root -" ];
# Set up the environment variables for running Nix. # Set up the environment variables for running Nix.
environment.sessionVariables = cfg.envVars // environment.sessionVariables = cfg.envVars //
{ NIX_PATH = cfg.nixPath; { NIX_PATH = cfg.nixPath;