Put all firmware in $out/lib/firmware

This way, hardware.firmware can be a list of packages.
2015-08-25 00:40:34 +02:00
parent ce6daa507a
commit 9c61317002
8 changed files with 24 additions and 28 deletions
@@ -50,7 +50,7 @@ let

        ln -s ${config.system.build.initialRamdisk}/initrd $out/initrd

-        ln -s ${config.hardware.firmware} $out/firmware
+        ln -s ${config.hardware.firmware}/lib/firmware $out/firmware
      ''}

      echo "$activationScript" > $out/activate
@@ -216,7 +216,7 @@ in
      ];

    # The Linux kernel >= 2.6.27 provides firmware.
-    hardware.firmware = [ "${kernel}/lib/firmware" ];
+    hardware.firmware = [ kernel ];

    # Create /etc/modules-load.d/nixos.conf, which is read by
    # systemd-modules-load.service to load required kernel modules.