From ad49d928995ec9337c02be4dd1f6c7e34e520c97 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 1 Aug 2012 11:56:12 -0400
Subject: [PATCH] linux/manual-config: When installing firmware, create the
 firmware directory prior to make *_install.

It is probably a kernel build system bug that this is necessary, but it's not really a big deal either.
---
 pkgs/os-specific/linux/kernel/manual-config.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index a4929102cb7..3f2d5d0a39c 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -111,7 +111,9 @@ stdenv.mkDerivation {
   ] ++ (optional isModular "MODLIB=$(out)/lib/modules/${modDirVersion}")
   ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware";
 
-  postInstall = if isModular then ''
+  postInstall = stdenv.lib.optionalString installsFirmware ''
+    mkdir -p $out/lib/firmware
+  '' + (if isModular then ''
     make modules_install $makeFlags "''${makeFlagsArray[@]}" \
       $installFlags "''${installFlagsArray[@]}"
     rm -f $out/lib/modules/${modDirVersion}/{build,source}
@@ -123,7 +125,7 @@ stdenv.mkDerivation {
   '' else optionalString installsFirmware ''
     make firmware_install $makeFlags "''${makeFlagsArray[@]}" \
       $installFlags "''${installFlagsArray[@]}"
-  '';
+  '');
 
   postFixup = optionalString isModular ''
     if [ -z "$dontStrip" ]; then