yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'buildClan: machineName' (#242) from Mic92-secret-fix into main

Browse Source
This commit is contained in:
clan-bot
2023-09-03 11:11:06 +00:00
parent 7827df6fc5 5dd318e637
commit d784cea792
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/build-clan/default.nix
View File

@@ -21,11 +21,14 @@ let
self.nixosModules.clanCore self.nixosModules.clanCore
(machineSettings name) (machineSettings name)
(machines.${name} or { }) (machines.${name} or { })
{ clanCore.clanDir = directory; } {
clanCore.machineName = name;
clanCore.clanDir = directory;
# TODO: remove this once we have a hardware-config mechanism # TODO: remove this once we have a hardware-config mechanism
{ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
}
]; ];
specialArgs = specialArgs; inherit specialArgs;
}) })
(machinesDirs // machines); (machinesDirs // machines);
in in