summary refs log tree commit diff
path: root/nixos/modules/hardware
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2017-05-08 08:50:03 +0100
committerJörg Thalheim <joerg@thalheim.io>2017-05-08 09:18:11 +0100
commit192f8e7699ffedb5a99515476d18793ec611aaa1 (patch)
treeb57ab1cefed435bfb50506f82b7fba841ecb9b28 /nixos/modules/hardware
parent6d598fccce0d4df5f3fc01c31027a739534f535a (diff)
downloadnixlib-192f8e7699ffedb5a99515476d18793ec611aaa1.tar
nixlib-192f8e7699ffedb5a99515476d18793ec611aaa1.tar.gz
nixlib-192f8e7699ffedb5a99515476d18793ec611aaa1.tar.bz2
nixlib-192f8e7699ffedb5a99515476d18793ec611aaa1.tar.lz
nixlib-192f8e7699ffedb5a99515476d18793ec611aaa1.tar.xz
nixlib-192f8e7699ffedb5a99515476d18793ec611aaa1.tar.zst
nixlib-192f8e7699ffedb5a99515476d18793ec611aaa1.zip
broadcom-bt-firmware: revert to unfree
license was misinterpreted, it is now only conditionally in the all
firmware list included, if `allowUnfree` is set.

fixes #25567
Diffstat (limited to 'nixos/modules/hardware')
-rw-r--r--nixos/modules/hardware/all-firmware.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix
index 6e7f0bb491a1..ceca3b887b58 100644
--- a/nixos/modules/hardware/all-firmware.nix
+++ b/nixos/modules/hardware/all-firmware.nix
@@ -23,11 +23,12 @@ with lib;
 
   config = mkIf config.hardware.enableAllFirmware {
     hardware.firmware = with pkgs; [
-      broadcom-bt-firmware
       firmwareLinuxNonfree
       intel2200BGFirmware
       rtl8723bs-firmware
       rtl8192su-firmware
+    ] ++ optionals config.nixpkgs.config.allowUnfree [
+      broadcom-bt-firmware
     ];
   };