Put all firmware in $out/lib/firmware

This way, hardware.firmware can be a list of packages.

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 = {

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/;

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)
   ''; # */