Unverified Commit 9c973022 authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

nixos/facter: fix conflict with `readOnlyPkgs` (#456076)

parents ec1f2934 37f37f59
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@
  ...
}:
{
  # Skip setting hostPlatform in test VMs where it's read-only
  # Tests have virtualisation.test options and import read-only.nix
  config.nixpkgs = lib.optionalAttrs (!(options ? virtualisation.test)) {
    hostPlatform = lib.mkIf (
      config.hardware.facter.report.system or null != null && !options.nixpkgs.pkgs.isDefined
    ) (lib.mkDefault config.hardware.facter.report.system);
  # Skip setting hostPlatform if it's read-only
  nixpkgs =
    lib.optionalAttrs
      (config.hardware.facter.report.system or null != null && !options.nixpkgs.hostPlatform.readOnly)
      {
        hostPlatform = lib.mkDefault config.hardware.facter.report.system;
      };
}