diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2017-05-08 08:50:03 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2017-05-08 09:18:11 +0100 |
| commit | 192f8e7699ffedb5a99515476d18793ec611aaa1 (patch) | |
| tree | b57ab1cefed435bfb50506f82b7fba841ecb9b28 | |
| parent | 6d598fccce0d4df5f3fc01c31027a739534f535a (diff) | |
| download | nixpkgs-192f8e7699ffedb5a99515476d18793ec611aaa1.tar nixpkgs-192f8e7699ffedb5a99515476d18793ec611aaa1.tar.gz nixpkgs-192f8e7699ffedb5a99515476d18793ec611aaa1.tar.bz2 nixpkgs-192f8e7699ffedb5a99515476d18793ec611aaa1.tar.lz nixpkgs-192f8e7699ffedb5a99515476d18793ec611aaa1.tar.xz nixpkgs-192f8e7699ffedb5a99515476d18793ec611aaa1.tar.zst nixpkgs-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
| -rw-r--r-- | nixos/modules/hardware/all-firmware.nix | 3 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index 6e7f0bb491a..ceca3b887b5 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 ]; }; diff --git a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix index 23970097d4a..87232acfa83 100644 --- a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Firmware for Broadcom WIDCOMM® Bluetooth devices"; homepage = http://www.catalog.update.microsoft.com/Search.aspx?q=Broadcom+bluetooth; - license = licenses.unfreeRedistributableFirmware; + license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ zraexy ]; }; |