Skip to content

Commit

Permalink
lib: builders: mkHost: circumvent crossSystem issue
Browse files Browse the repository at this point in the history
  • Loading branch information
spikespaz committed Jun 23, 2023
1 parent c69dbef commit ba6570e
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion lib/builders.nix
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,14 @@ let
pkgs = import nixpkgs ({
inherit overlays;
localSystem = buildPlatform;
# This does not work due to a litany of problems with platform comparisons
# <https://github.com/NixOS/nixpkgs/pull/237512>
# <https://github.com/NixOS/nixpkgs/pull/238136>
# <https://github.com/NixOS/nixpkgs/pull/238331>
# crossSystem = hostPlatform;
} // (lib.optionalAttrs (!lib.systems.equals hostPlatform buildPlatform) {
crossSystem = hostPlatform;
} // nixpkgsArgs);
}) // nixpkgsArgs);
in nixpkgs.lib.nixosSystem ((removeAttrs setup ownArgs) // {
modules = [{ nixpkgs.pkgs = pkgs; }] ++ modules;
specialArgs = args // specialArgs // { inherit nixpkgs; };
Expand Down

0 comments on commit ba6570e

Please sign in to comment.