nrabulinski/settei
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix garnix

Browse source
This commit is contained in:
Nikodem Rabuliński 2024-08-14 23:33:07 +02:00
parent db6d721df6
commit 025e63d1e6
2 changed files with 15 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

16
flake.nix
View file

@ -38,18 +38,7 @@
]; ];
}; };
packages = packages = {
let
darwinConfigs = lib.filterAttrs (
_: config: config.eval.config.nixpkgs.system == system
) inputs.self.darwinConfigurations;
# Force garnix to build the config
darwinConfigs' = lib.mapAttrs' (name: config: {
name = "__darwinConfigurations_${name}";
value = config.system;
}) darwinConfigs;
in
{
# Re-export it for convenience and for caching # Re-export it for convenience and for caching
inherit (inputs'.attic.packages) attic-client attic-server; inherit (inputs'.attic.packages) attic-client attic-server;
base-packages = pkgs.symlinkJoin { base-packages = pkgs.symlinkJoin {
@ -60,8 +49,7 @@
git-commit-last git-commit-last
]; ];
}; };
} };
// darwinConfigs';
formatter = pkgs.nixfmt-rfc-style; formatter = pkgs.nixfmt-rfc-style;
}; };

8
hosts/default.nix
View file

@ -66,15 +66,9 @@
darwin = darwin =
name: module: name: module:
let baseDarwin._module.args.extendModules {
eval = baseDarwin._module.args.extendModules {
modules = [ module ]; modules = [ module ];
specialArgs.configurationName = name; specialArgs.configurationName = name;
}; };
in
{
system = eval.config.system.build.toplevel;
inherit eval;
};
}; };
} }