diff options
| author | adisbladis <adisbladis@gmail.com> | 2022-05-14 02:38:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-14 02:38:48 +0800 |
| commit | fb222e008681fce4608e94f2d1dfdf3d03a364c4 (patch) | |
| tree | fc6a89202a2767cb06b8d33b6b81a115f172c146 /pkgs/os-specific | |
| parent | 75101b2d5b27add98ebb35185fa1133ba24f3088 (diff) | |
| parent | 8aa8e0ce7f137fe329608efcbb3494a5e6a63f42 (diff) | |
Merge pull request #172820 from alyssais/compressed-firmware
Compressed firmware
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix index 622b89b1baea5..92c179726d255 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { sourceRoot = "."; installPhase = '' - mkdir $out - b43-fwcutter -w $out *.wl_apsta.o + mkdir -p $out/lib/firmware + b43-fwcutter -w $out/lib/firmware *.wl_apsta.o ''; meta = with lib; { diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index fdf54d302bf20..d25e20bac8b2a 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -883,6 +883,8 @@ let # Disable the firmware helper fallback, udev doesn't implement it any more FW_LOADER_USER_HELPER_FALLBACK = option no; + FW_LOADER_COMPRESS = option yes; + HOTPLUG_PCI_ACPI = yes; # PCI hotplug using ACPI HOTPLUG_PCI_PCIE = yes; # PCI-Expresscard hotplug support |