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

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
This commit is contained in:
Jörg Thalheim 2017-05-08 08:50:03 +01:00
parent 6d598fccce
commit 192f8e7699
No known key found for this signature in database
GPG Key ID: CA4106B8D7CC79FA
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,11 +23,12 @@ with lib;
config = mkIf config.hardware.enableAllFirmware { config = mkIf config.hardware.enableAllFirmware {
hardware.firmware = with pkgs; [ hardware.firmware = with pkgs; [
broadcom-bt-firmware
firmwareLinuxNonfree firmwareLinuxNonfree
intel2200BGFirmware intel2200BGFirmware
rtl8723bs-firmware rtl8723bs-firmware
rtl8192su-firmware rtl8192su-firmware
] ++ optionals config.nixpkgs.config.allowUnfree [
broadcom-bt-firmware
]; ];
}; };

2
pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Firmware for Broadcom WIDCOMM® Bluetooth devices"; description = "Firmware for Broadcom WIDCOMM® Bluetooth devices";
homepage = http://www.catalog.update.microsoft.com/Search.aspx?q=Broadcom+bluetooth; homepage = http://www.catalog.update.microsoft.com/Search.aspx?q=Broadcom+bluetooth;
license = licenses.unfreeRedistributableFirmware; license = licenses.unfree;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ zraexy ]; maintainers = with maintainers; [ zraexy ];
}; };