From 25bd880472ade2532bf9b6af5d40b4361e10bb02 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 Sep 2013 14:22:52 +0200
Subject: [PATCH] Get firmware from lib/firmware

---
 modules/hardware/all-firmware.nix        | 2 +-
 modules/hardware/cpu/amd-microcode.nix   | 2 +-
 modules/hardware/cpu/intel-microcode.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/hardware/all-firmware.nix b/modules/hardware/all-firmware.nix
index 9ef7b1523fcd..16b6a862593a 100644
--- a/modules/hardware/all-firmware.nix
+++ b/modules/hardware/all-firmware.nix
@@ -20,7 +20,7 @@
   ###### implementation
 
   config = pkgs.lib.mkIf config.hardware.enableAllFirmware {
-    hardware.firmware = [ pkgs.firmwareLinuxNonfree ];
+    hardware.firmware = [ "${pkgs.firmwareLinuxNonfree}/lib/firmware" ];
   };
 
 }
diff --git a/modules/hardware/cpu/amd-microcode.nix b/modules/hardware/cpu/amd-microcode.nix
index 350bcb74885f..5720a63834f5 100644
--- a/modules/hardware/cpu/amd-microcode.nix
+++ b/modules/hardware/cpu/amd-microcode.nix
@@ -22,7 +22,7 @@ with pkgs.lib;
   ###### implementation
 
   config = mkIf config.hardware.cpu.amd.updateMicrocode {
-    hardware.firmware = [ pkgs.amdUcode ];
+    hardware.firmware = [ "${pkgs.amdUcode}/lib/firmware" ];
     boot.kernelModules = [ "microcode" ];
   };
 
diff --git a/modules/hardware/cpu/intel-microcode.nix b/modules/hardware/cpu/intel-microcode.nix
index b8e97b4ca4ac..9046ddf83bbf 100644
--- a/modules/hardware/cpu/intel-microcode.nix
+++ b/modules/hardware/cpu/intel-microcode.nix
@@ -22,7 +22,7 @@ with pkgs.lib;
   ###### implementation
 
   config = mkIf config.hardware.cpu.intel.updateMicrocode {
-    hardware.firmware = [ pkgs.microcodeIntel ];
+    hardware.firmware = [ "${pkgs.microcodeIntel}/lib/firmware" ];
     boot.kernelModules = [ "microcode" ];
   };