Merge pull request 'build-clan: Removed unecessary arg, machineDescription and machineIcon' (#810) from Qubasa-main into main
This commit is contained in:
commit
6a62018f1d
@ -4,8 +4,6 @@
|
|||||||
, machines ? { } # allows to include machine-specific modules i.e. machines.${name} = { ... }
|
, machines ? { } # allows to include machine-specific modules i.e. machines.${name} = { ... }
|
||||||
, clanName # Needs to be (globally) unique, as this determines the folder name where the flake gets downloaded to.
|
, clanName # Needs to be (globally) unique, as this determines the folder name where the flake gets downloaded to.
|
||||||
, clanIcon ? null # A path to an icon to be used for the clan, should be the same for all machines
|
, clanIcon ? null # A path to an icon to be used for the clan, should be the same for all machines
|
||||||
, machineIcon ? null # A path to an icon to be used for the machine
|
|
||||||
, machineDescription ? null # A description of the machine
|
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
machinesDirs = lib.optionalAttrs (builtins.pathExists "${directory}/machines") (builtins.readDir (directory + /machines));
|
machinesDirs = lib.optionalAttrs (builtins.pathExists "${directory}/machines") (builtins.readDir (directory + /machines));
|
||||||
@ -47,8 +45,8 @@ let
|
|||||||
clanCore.clanName = clanName;
|
clanCore.clanName = clanName;
|
||||||
clanCore.clanIcon = clanIcon;
|
clanCore.clanIcon = clanIcon;
|
||||||
clanCore.clanDir = directory;
|
clanCore.clanDir = directory;
|
||||||
clanCore.machineIcon = machineIcon;
|
clanCore.machineIcon = clanIcon;
|
||||||
clanCore.machineDescription = machineDescription;
|
clanCore.machineDescription = null;
|
||||||
nixpkgs.hostPlatform = if forceSystem then lib.mkForce system else lib.mkDefault system;
|
nixpkgs.hostPlatform = if forceSystem then lib.mkForce system else lib.mkDefault system;
|
||||||
|
|
||||||
# speeds up nix commands by using the nixpkgs from the host system (especially useful in VMs)
|
# speeds up nix commands by using the nixpkgs from the host system (especially useful in VMs)
|
||||||
|
@ -11,6 +11,9 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "../../nixosModules"
|
"path": "../../nixosModules"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"path": "../../lib/build-clan"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"settings": {
|
"settings": {
|
||||||
|
Loading…
Reference in New Issue
Block a user