From c5a8d53d95d92743298ef1ffb9482c449981a2e1 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 18 Mar 2012 08:10:32 +0000
Subject: [PATCH] fixed intel microcode loading during boot

svn path=/nixos/trunk/; revision=33226
---
 modules/hardware/cpu/intel-microcode.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/hardware/cpu/intel-microcode.nix b/modules/hardware/cpu/intel-microcode.nix
index b8e97b4ca4a..fa7a6edc737 100644
--- a/modules/hardware/cpu/intel-microcode.nix
+++ b/modules/hardware/cpu/intel-microcode.nix
@@ -23,7 +23,17 @@ with pkgs.lib;
 
   config = mkIf config.hardware.cpu.intel.updateMicrocode {
     hardware.firmware = [ pkgs.microcodeIntel ];
-    boot.kernelModules = [ "microcode" ];
+
+    # This cannot be done using boot.kernelModules
+    # discussion at http://lists.science.uu.nl/pipermail/nix-dev/2012-February/007959.html
+    jobs.microcode = {
+      name = "microcode";
+      description = "load microcode";
+      startOn = "started udev";
+      exec = "modprobe microcode";
+      path = [config.system.sbin.modprobe];
+      task = true;
+    };
   };
 
 }