Fix weird errors on container run

domenkozar · domenkozar · commit 9bd25295f4c2 · 2024-03-25T09:59:26.000Z
diff --git a/devenv/src/flake.tmpl.nix b/devenv/src/flake.tmpl.nix
@@ -65,7 +65,7 @@
               {
                 devenv.cliVersion = version;
                 devenv.root = devenv_root;
-                devenv.dotfile = pkgs.lib.mkForce (devenv_root + "/" + devenv_dotfile_string);
+                devenv.dotfile = devenv_root + "/" + devenv_dotfile_string;
               }
               (pkgs.lib.optionalAttrs (inputs.devenv.isTmpDir or false) {
                 devenv.tmpdir = tmpdir;
diff --git a/src/modules/containers.nix b/src/modules/containers.nix
@@ -297,6 +297,7 @@ in
     })
     (lib.mkIf config.container.isBuilding {
       devenv.root = lib.mkForce "${homeDir}";
+      devenv.dotfile = lib.mkOverride 49 "${homeDir}/.devenv";
     })
   ];
 }

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@`
`65`	`65`	`{`
`66`	`66`	`devenv.cliVersion = version;`
`67`	`67`	`devenv.root = devenv_root;`
`68`		`- devenv.dotfile = pkgs.lib.mkForce (devenv_root + "/" + devenv_dotfile_string);`
	`68`	`+ devenv.dotfile = devenv_root + "/" + devenv_dotfile_string;`
`69`	`69`	`}`
`70`	`70`	`(pkgs.lib.optionalAttrs (inputs.devenv.isTmpDir or false) {`
`71`	`71`	`devenv.tmpdir = tmpdir;`
Original file line number	Diff line number	Diff line change
`@@ -297,6 +297,7 @@ in`
`297`	`297`	`})`
`298`	`298`	`(lib.mkIf config.container.isBuilding {`
`299`	`299`	`devenv.root = lib.mkForce "${homeDir}";`
	`300`	`+ devenv.dotfile = lib.mkOverride 49 "${homeDir}/.devenv";`
`300`	`301`	`})`
`301`	`302`	`];`
`302`	`303`	`}`