JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Linux 3.3 puts some of its headers in include/generated

Browse Source 
svn path=/nixpkgs/trunk/; revision=33282
This commit is contained in:
Shea Levy 2012-03-20 00:02:24 +00:00
parent 5f32e704bf
commit a74565238a
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/broadcom-sta/default.nix
View File

@ -21,6 +21,8 @@ stdenv.mkDerivation {
#(! builtins.lessThan (builtins.compareVersions kernel.version "2.6.37") 0) #(! builtins.lessThan (builtins.compareVersions kernel.version "2.6.37") 0)
#[ ./mutex-sema.patch ]; #[ ./mutex-sema.patch ];
NIX_CFLAGS_COMPILE = "-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated";
makeFlags = "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/build"; makeFlags = "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/build";
unpackPhase = unpackPhase =

2
pkgs/os-specific/linux/nvidia-x11/builder.sh
View File

@ -17,7 +17,7 @@ buildPhase() {
sysSrc=$(echo $kernel/lib/modules/$kernelVersion/build/) sysSrc=$(echo $kernel/lib/modules/$kernelVersion/build/)
unset src # used by the nv makefile unset src # used by the nv makefile
# Hack necessary to compile on 2.6.28. # 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 make SYSSRC=$sysSrc module
cd .. cd ..
fi fi