From a74565238a0cac702a17bfb560753e89209b5e91 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 20 Mar 2012 00:02:24 +0000
Subject: [PATCH] Linux 3.3 puts some of its headers in include/generated

svn path=/nixpkgs/trunk/; revision=33282
---
 pkgs/os-specific/linux/broadcom-sta/default.nix | 2 ++
 pkgs/os-specific/linux/nvidia-x11/builder.sh    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index 1c5573017299..ff21b5d5254b 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation {
     #(! builtins.lessThan (builtins.compareVersions kernel.version "2.6.37") 0)
       #[ ./mutex-sema.patch ];
 
+  NIX_CFLAGS_COMPILE = "-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated";
+
   makeFlags = "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/build";
 
   unpackPhase =
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index b0d2bf35c52a..ace9d50cdeec 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -17,7 +17,7 @@ buildPhase() {
         sysSrc=$(echo $kernel/lib/modules/$kernelVersion/build/)
         unset src # used by the nv makefile
         # Hack necessary to compile on 2.6.28.
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$sysSrc/include/asm/mach-default"
+        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$sysSrc/include/asm/mach-default -I$sysSrc/include/generated"
         make SYSSRC=$sysSrc module
         cd ..
     fi