From 192f8e7699ffedb5a99515476d18793ec611aaa1 Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Mon, 8 May 2017 08:50:03 +0100 Subject: 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 --- nixos/modules/hardware/all-firmware.nix | 3 ++- 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 ]; }; -- cgit 1.4.1