From 0e4417f1185e2093eb4f084e144f49a66f701db9 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 19 Apr 2020 15:03:37 +0200
Subject: [PATCH] Revert "nixos: Introduce nix.buildLocation option"

This reverts commit 5291925fd2486175e781669412fa5a525da7602a.
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.
---
 nixos/modules/services/misc/nix-daemon.nix | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 022ddad8f367..0c2407e1dd2f 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -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 ];
 
         environment = cfg.envVars
-          // { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt";
-               TMPDIR = cfg.buildLocation;
-             }
+          // { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt"; }
           // config.networking.proxy.envVars;
 
         unitConfig.RequiresMountsFor = "/nix/store";
@@ -502,8 +490,6 @@ in
         restartTriggers = [ nixConf ];
       };
 
-    systemd.tmpfiles.rules = [ "d ${cfg.buildLocation} 0775 root root -" ];
-
     # Set up the environment variables for running Nix.
     environment.sessionVariables = cfg.envVars //
       { NIX_PATH = cfg.nixPath;