diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-08-25 00:27:06 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-08-25 00:40:34 +0200 |
| commit | 9c61317002edf32812d793aebac86a990edcd1cb (patch) | |
| tree | 0fcf366014270704b5705b54c4ee01445c78ce3c /pkgs | |
| parent | ce6daa507a4e110aa33447f70bd4764df9ea10c8 (diff) | |
| download | nixlib-9c61317002edf32812d793aebac86a990edcd1cb.tar nixlib-9c61317002edf32812d793aebac86a990edcd1cb.tar.gz nixlib-9c61317002edf32812d793aebac86a990edcd1cb.tar.bz2 nixlib-9c61317002edf32812d793aebac86a990edcd1cb.tar.lz nixlib-9c61317002edf32812d793aebac86a990edcd1cb.tar.xz nixlib-9c61317002edf32812d793aebac86a990edcd1cb.tar.zst nixlib-9c61317002edf32812d793aebac86a990edcd1cb.zip | |
Put all firmware in $out/lib/firmware
This way, hardware.firmware can be a list of packages.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/firmware/zd1211/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/wis-go7007/default.nix | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix index 436f40712fc2..1cc0e7ae4ca7 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation { phases = [ "unpackPhase" "installPhase" ]; installPhase = '' - mkdir $out - b43-fwcutter -w $out linux/wl_apsta.o + mkdir -p $out/lib/firmware + b43-fwcutter -w $out/lib/firmware linux/wl_apsta.o ''; meta = { diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix index 96e534e3b805..19cbdecca0cc 100644 --- a/pkgs/os-specific/linux/firmware/zd1211/default.nix +++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix @@ -5,16 +5,16 @@ stdenv.mkDerivation rec { version = "1.5"; name = "${pname}-${version}"; - + src = fetchurl { url = "mirror://sourceforge/zd1211/${name}.tar.bz2"; sha256 = "04ibs0qw8bh6h6zmm5iz6lddgknwhsjq8ib3gyck6a7psw83h7gi"; }; - + buildPhase = "true"; - installPhase = "mkdir -p $out/zd1211; cp * $out/zd1211"; - + installPhase = "mkdir -p $out/lib/firmware/zd1211; cp * $out/lib/firmware/zd1211"; + meta = { description = "Firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip"; homepage = http://sourceforge.net/projects/zd1211/; diff --git a/pkgs/os-specific/linux/wis-go7007/default.nix b/pkgs/os-specific/linux/wis-go7007/default.nix index 538686720257..4dae68d4871e 100644 --- a/pkgs/os-specific/linux/wis-go7007/default.nix +++ b/pkgs/os-specific/linux/wis-go7007/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { mkdir -p $out/etc/udev/rules.d makeFlagsArray=(KERNELSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source \ - FIRMWARE_DIR=$out/firmware FXLOAD=${fxload}/sbin/fxload \ + FIRMWARE_DIR=$out/lib/firmware FXLOAD=${fxload}/sbin/fxload \ DESTDIR=$out SKIP_DEPMOD=1 \ USE_UDEV=y) ''; # */ |