mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-27 14:34:33 +00:00
Some renaming as was mentioned on the mailinglist.
Also, removed the firmware-free option because that firmware is already in the kernel package and thus causing collisions otherwise. svn path=/nixos/trunk/; revision=31527
This commit is contained in:
parent
50d7a38c82
commit
4d26262878
@ -6,11 +6,11 @@
|
||||
|
||||
options = {
|
||||
|
||||
hardware.enableFirmwareLinuxNonfree = pkgs.lib.mkOption {
|
||||
hardware.enableAllFirmware = pkgs.lib.mkOption {
|
||||
default = false;
|
||||
type = pkgs.lib.types.bool;
|
||||
description = ''
|
||||
Turn on this option if you want the set of firmware of the non-free package.
|
||||
Turn on this option if you want to enable all the firmware shipped with Debian/Ubuntu.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
###### implementation
|
||||
|
||||
config = pkgs.lib.mkIf config.hardware.enableFirmwareLinuxNonfree {
|
||||
config = pkgs.lib.mkIf config.hardware.enableAllFirmware {
|
||||
hardware.firmware = [ pkgs.firmwareLinuxNonfree ];
|
||||
};
|
||||
|
@ -1,26 +0,0 @@
|
||||
{pkgs, config, ...}:
|
||||
|
||||
{
|
||||
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
hardware.enableFirmwareLinuxFree = pkgs.lib.mkOption {
|
||||
default = false;
|
||||
type = pkgs.lib.types.bool;
|
||||
description = ''
|
||||
Turn on this option if you want the set of firmware of the linux-firmware-free package.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
###### implementation
|
||||
|
||||
config = pkgs.lib.mkIf config.hardware.enableFirmwareLinuxFree {
|
||||
hardware.firmware = [ pkgs.firmwareLinuxFree ];
|
||||
};
|
||||
|
||||
}
|
@ -20,8 +20,7 @@
|
||||
./hardware/network/rt73.nix
|
||||
./hardware/network/rtl8192c.nix
|
||||
./hardware/pcmcia.nix
|
||||
./hardware/firmware-nonfree.nix
|
||||
./hardware/firmware-free.nix
|
||||
./hardware/all-firmware.nix
|
||||
./installer/generations-dir/generations-dir.nix
|
||||
./installer/grub/grub.nix
|
||||
./installer/init-script/init-script.nix
|
||||
|
Loading…
Reference in New Issue
Block a user