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

Merge pull request #262565 from Atemu/nixos/firmware-mkEnableOption

Browse Source 
nixos/hardware: use mkEnableOption
This commit is contained in:
Atemu 2023-11-07 15:59:03 +01:00 committed by GitHub
commit 8a8a2a1071
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nixos/modules/hardware/all-firmware.nix
View File

@ -18,29 +18,16 @@ in {
options = { options = {
hardware.enableAllFirmware = mkOption { hardware.enableAllFirmware = mkEnableOption "all firmware regardless of license";
default = false;
type = types.bool;
description = lib.mdDoc ''
Turn on this option if you want to enable all the firmware.
'';
};
hardware.enableRedistributableFirmware = mkOption { hardware.enableRedistributableFirmware = mkEnableOption "firmware with a license allowing redistribution" // {
default = config.hardware.enableAllFirmware; default = config.hardware.enableAllFirmware;
defaultText = lib.literalExpression "config.hardware.enableAllFirmware"; defaultText = lib.literalExpression "config.hardware.enableAllFirmware";
type = types.bool;
description = lib.mdDoc ''
Turn on this option if you want to enable all the firmware with a license allowing redistribution.
'';
}; };
hardware.wirelessRegulatoryDatabase = mkOption { hardware.wirelessRegulatoryDatabase = mkEnableOption "loading the wireless regulatory database at boot" // {
default = false; default = cfg.enableRedistributableFirmware || cfg.enableAllFirmware;
type = types.bool; defaultText = literalMD "Enabled if proprietary firmware is allowed via {option}`enableRedistributableFirmware` or {option}`enableAllFirmware`.";
description = lib.mdDoc ''
Load the wireless regulatory database at boot.
'';
}; };
}; };
@ -65,7 +52,6 @@ in {
++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [ ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [
rtl8723bs-firmware rtl8723bs-firmware
]; ];
hardware.wirelessRegulatoryDatabase = true;
}) })
(mkIf cfg.enableAllFirmware { (mkIf cfg.enableAllFirmware {
assertions = [{ assertions = [{