Merge pull request #1023 from cachix/backward-compatible-tmpdir

backward compatible devenv.tmpdir
cachix · Mar 21, 2024 · e6482de · e6482de
2 parents 47363a7 + 60df0f3
commit e6482de
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/devenv/src/flake.tmpl.nix b/devenv/src/flake.tmpl.nix
@@ -63,12 +63,14 @@
                 devenv.cliVersion = version;
                 devenv.root = devenv_root;
                 devenv.dotfile = pkgs.lib.mkForce (devenv_root + "/" + devenv_dotfile_string);
-                devenv.tmpdir = tmpdir;
               }
-              (if container_name != null then {
+              (pkgs.lib.optionalAttrs (inputs.devenv.isTmpDir or false) {
+                devenv.tmpdir = tmpdir;
+              })
+              (pkgs.lib.optionalAttrs (container_name != null) {
                 container.isBuilding = pkgs.lib.mkForce true;
                 containers.${container_name}.isBuilding = true;
-              } else { })
+              })
             ] ++ (map importModule (devenv.imports or [ ])) ++ [
               ./devenv.nix
               (devenv.devenv or { })

diff --git a/flake.nix b/flake.nix
@@ -79,6 +79,7 @@
         });
 
       modules = ./src/modules;
+      hasTmpDir = true;
 
       templates =
         let

diff --git a/src/modules/flake.nix b/src/modules/flake.nix
@@ -1,5 +1,6 @@
 {
   outputs = { ... }: {
     modules = ./.;
+    hasTmpDir = true;
   };
 }