Author: amiddelk
Date: Thu Jan 12 10:17:29 2012
New Revision: 31492
URL: https://nixos.org/websvn/nix/?rev=31492&sc=1
Log:
Fixed rtl8192cfw firmware package.
Also, added a package that fetches all firmware from dwmw2's repo on kernel.org.
Specific firmware can then simply copy the driver out of this repo. Perhaps it
would actually be useful to write some abstraction for that.
Anyway, I'm not sure if fetching the git repo is a good idea to start with. The
repo does not have tags, so I'm forced to either take the HEAD or a particular
commit (chose the last option). However, this is likely to need ongoing
maintenance.
Added:
nixpkgs/trunk/pkgs/os-specific/linux/firmware/dwmw2/
nixpkgs/trunk/pkgs/os-specific/linux/firmware/dwmw2/default.nix
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/firmware/rtl8192c/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/os-specific/linux/firmware/dwmw2/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/os-specific/linux/firmware/dwmw2/default.nix Thu Jan
12 10:17:29 2012 (r31492)
@@ -0,0 +1,14 @@
+{stdenv, fetchgit}:
+
+let
+ repo =
"git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git";
+ src = fetchgit {
+ url = repo;
+ rev = "15888a2eab052ac3d3f49334e4f6f05f347a516e";
+ sha256 =
"df63b71dd56ad85f97784076eeced76849e95cb30a9909e8322f7fdd54f227b4";
+ };
+ meta = {
+ description = "GIT repo of the linux firmware binaries";
+ homepage = repo;
+ };
+in stdenv.lib.setName "linux-firmware" (stdenv.lib.addMetaAttrs meta src)
Modified: nixpkgs/trunk/pkgs/os-specific/linux/firmware/rtl8192c/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/firmware/rtl8192c/default.nix Thu Jan
12 07:54:14 2012 (r31491)
+++ nixpkgs/trunk/pkgs/os-specific/linux/firmware/rtl8192c/default.nix Thu Jan
12 10:17:29 2012 (r31492)
@@ -1,23 +1,18 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
- name = "rtl8192c-fw";
- src = fetchurl {
- url =
"ftp://WebUser:[email protected]/cn/wlan/92ce_se_de_linux_mac80211_0004.0816.2011.tar.gz";;
- sha256 = "1kg63h5rj4kja2csmqsrxjipb1wpznfbrvn9cla9d9byksy5fn64";
- };
-
- phases = [ "unpackPhase" "installPhase" ];
-
- # Installation copies the firmware AND the license. The license
- # says: "Your rights to redistribute the Software shall be
- # contingent upon your installation of this Agreement in its
- # entirety in the same directory as the Software."
- installPhase = "ensureDir $out; cp -a firmware/* $out";
-
+{stdenv, linuxFirmware}:
+let
+ src = linuxFirmware;
+ dir = "rtlwifi";
+ file = "rtl8192cfw.bin";
meta = {
description = "Firmware for the Realtek RTL8192c wireless cards";
homepage = "http://www.realtek.com";;
license = "non-free";
- };
+ };
+in stdenv.mkDerivation {
+ name = "rtl8192c-fw";
+ inherit src meta dir file;
+
+ phases = [ "installPhase" ];
+
+ installPhase = "ensureDir $out/$dir && cp $src/$dir/$file $out/$dir/$file";
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Jan 12 07:54:14
2012 (r31491)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Jan 12 10:17:29
2012 (r31492)
@@ -6026,6 +6026,8 @@
rtkit = callPackage ../os-specific/linux/rtkit { };
+ linuxFirmware = callPackage ../os-specific/linux/firmware/dwmw2 { };
+
rtl8192cfw = callPackage ../os-specific/linux/firmware/rtl8192c { };
rtl8168e2fw = callPackage ../os-specific/linux/firmware/rtl8168e-2 { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
