gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jörg Thalheim
2025-11-04 18:14:46 +00:00
committed by GitHub
parent ec1f293434 37f37f59b5
commit 9c973022fc
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
nixos/modules/hardware/facter/system.nix
View File

@@ -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;
};
}