diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-02-08 14:59:09 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-02-08 14:59:09 -0800 |
| commit | 8405d37d9ac42a65cd8073a3cdf531ca8eb0ce2a (patch) | |
| tree | 028692f928c0de278ea0e0d2cdb39a488001c9b5 /pkgs/os-specific/linux | |
| parent | a4ef29c499d4d7b1ee7f96d1a5589675ece0a70b (diff) | |
| parent | c0d95c2f80a4a3b51e6ee589462c8634b14edd20 (diff) | |
| download | nixpkgs-8405d37d9ac42a65cd8073a3cdf531ca8eb0ce2a.tar nixpkgs-8405d37d9ac42a65cd8073a3cdf531ca8eb0ce2a.tar.gz nixpkgs-8405d37d9ac42a65cd8073a3cdf531ca8eb0ce2a.tar.bz2 nixpkgs-8405d37d9ac42a65cd8073a3cdf531ca8eb0ce2a.tar.lz nixpkgs-8405d37d9ac42a65cd8073a3cdf531ca8eb0ce2a.tar.xz nixpkgs-8405d37d9ac42a65cd8073a3cdf531ca8eb0ce2a.tar.zst nixpkgs-8405d37d9ac42a65cd8073a3cdf531ca8eb0ce2a.zip | |
Merge pull request #5530 from abbradar/ibt-hw
linux-firmware: add ibt-hw firmware
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 2868be73d39..78c1e857ebe 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -17,8 +17,7 @@ let { name = "intelwimax"; sha256 = "1avls6sx0pbsffrcs267r2r2rqlx2xrv8j9znc7ix1bi8g4fx91v"; } { name = "ipw2x00"; sha256 = "19zqc30hsz7snw020izm81qbap3xsygggnmbspxndw7jihz0amjs"; } { name = "ivtv"; sha256 = "1f2004lpw5nr9rxj3cl4ba0jdm51wkvsrbiy4drakawpjwh5y4qw"; } - # Disabled as it is packaged separately - #{ name = "iwlwifi"; sha256 = "1538r751mx8nhg3xibnnrhnflvf3kl5y9rnm7rpl4wyrfgx61amd"; } + { name = "iwlwifi"; sha256 = "1538r751mx8nhg3xibnnrhnflvf3kl5y9rnm7rpl4wyrfgx61amd"; } { name = "libertas"; sha256 = "0svkqlsiqgmh970r38nh0c1pjx41zdfql2k2k5djw99fscjklacd"; } { name = "linux"; sha256 = "0j62v6vbh2287j3x5c9i0xspmhyh5k1z8dyajgix7k37xi4jvpy2"; } { name = "linux-nonfree"; sha256 = "1f5x72rzicivwm0sn9l6wjkx7z9a0b8n6c9m60xrqg36ly7mizzp"; } @@ -58,6 +57,8 @@ in stdenv.mkDerivation { installPhase = '' mkdir -p $out/share $out/lib/firmware cp -r lib/firmware/* "$out/lib/firmware/" + # iwlwifi is packaged separately, but we need Bluetooth fw + rm $out/lib/firmware/iwlwifi* cp -r usr/share/doc $out/share/ find $out/share -name changelog.gz | xargs rm ''; |