Skip to content

Commit abbc375

Browse files
blackheavenMic92
andauthored
fixup! feat: add flag to disable containers tooling (#1367)
Co-authored-by: Jörg Thalheim <[email protected]>
1 parent 7fa15b0 commit abbc375

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

src/modules/containers.nix

+8-13
Original file line numberDiff line numberDiff line change
@@ -135,20 +135,15 @@ let
135135
}
136136
];
137137

138-
config = lib.attrsets.mergeAttrsList [
139-
{
140-
User = "${user}";
141-
WorkingDir = "${homeDir}";
142-
}
143-
(if cfg.isDev then {
144-
Env = lib.mapAttrsToList (name: value: "${name}=${toString value}")
138+
config = {
139+
User = "${user}";
140+
WorkingDir = "${homeDir}";
141+
} // lib.optionalAttrs cfg.isDev {
142+
Env = lib.mapAttrsToList (name: value: "${name}=${toString value}")
145143
config.env ++ [ "HOME=${homeDir}" "USER=${user}" ];
146-
Entrypoint = cfg.entrypoint;
147-
Cmd = [ cfg.startupCommand ];
148-
} else
149-
{ })
150-
];
151-
};
144+
Entrypoint = cfg.entrypoint;
145+
Cmd = [ cfg.startupCommand ];
146+
};
152147

153148
# <registry> <args>
154149
mkCopyScript = cfg: pkgs.writeShellScript "copy-container" ''

0 commit comments

Comments
 (0)