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

fix deploying from darwin to linux

Browse Source
This commit is contained in:
Jörg Thalheim
2024-12-04 12:33:43 +01:00
parent 39daf4e3df
commit 2e07bfa834
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/build-clan/module.nix
View File

@@ -67,13 +67,21 @@ let
# Machine specific settings # Machine specific settings
clan.core.machineName = name; clan.core.machineName = name;
networking.hostName = lib.mkDefault name; networking.hostName = lib.mkDefault name;
nixpkgs.hostPlatform = lib.mkIf (system != null) (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)
nix.registry.nixpkgs.to = lib.mkDefault { nix.registry.nixpkgs.to = lib.mkDefault {
type = "path"; type = "path";
path = lib.mkDefault nixpkgs; path = lib.mkDefault nixpkgs;
}; };
# For vars we need to override the system so we run vars
# generators on the machine that runs `clan vars generate`. If a
# users is using the `pkgsForSystem`, we don't set
# nixpkgs.hostPlatform it would conflict with the `nixpkgs.pkgs`
# option.
nixpkgs.hostPlatform = lib.mkIf (system != null && (pkgsForSystem system) != null) (
lib.mkForce system
);
} }
// lib.optionalAttrs (pkgs != null) { nixpkgs.pkgs = lib.mkForce pkgs; } // lib.optionalAttrs (pkgs != null) { nixpkgs.pkgs = lib.mkForce pkgs; }
) )