From 75cfd8494982675e51a596e72cdc578f63eea21e Mon Sep 17 00:00:00 2001 From: DavHau Date: Sat, 2 Sep 2023 18:26:45 +0200 Subject: [PATCH] buildClan: set clanCore.directory and hostPlatform --- lib/build-clan/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/build-clan/default.nix b/lib/build-clan/default.nix index 4da48dafd..6539a366c 100644 --- a/lib/build-clan/default.nix +++ b/lib/build-clan/default.nix @@ -1,4 +1,4 @@ -{ nixpkgs, clan, lib }: +{ nixpkgs, self, lib }: { directory # The directory containing the machines subdirectory , specialArgs ? { } # Extra arguments to pass to nixosSystem i.e. useful to make self available , machines ? { } # allows to include machine-specific modules i.e. machines.${name} = { ... } @@ -18,9 +18,12 @@ let (name: _: nixpkgs.lib.nixosSystem { modules = [ - clan.nixosModules.clanCore + self.nixosModules.clanCore (machineSettings name) (machines.${name} or { }) + { clanCore.clanDir = directory; } + # TODO: remove this once we have a hardware-config mechanism + { nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } ]; specialArgs = specialArgs; })