Author: shlevy
Date: Tue Mar 20 00:02:24 2012
New Revision: 33282
URL: https://nixos.org/websvn/nix/?rev=33282&sc=1
Log:
Linux 3.3 puts some of its headers in include/generated
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/broadcom-sta/default.nix
nixpkgs/trunk/pkgs/os-specific/linux/nvidia-x11/builder.sh
Modified: nixpkgs/trunk/pkgs/os-specific/linux/broadcom-sta/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/broadcom-sta/default.nix Mon Mar
19 23:57:26 2012 (r33281)
+++ nixpkgs/trunk/pkgs/os-specific/linux/broadcom-sta/default.nix Tue Mar
20 00:02:24 2012 (r33282)
@@ -21,6 +21,8 @@
#(! 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 =
Modified: nixpkgs/trunk/pkgs/os-specific/linux/nvidia-x11/builder.sh
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/nvidia-x11/builder.sh Mon Mar 19
23:57:26 2012 (r33281)
+++ nixpkgs/trunk/pkgs/os-specific/linux/nvidia-x11/builder.sh Tue Mar 20
00:02:24 2012 (r33282)
@@ -17,7 +17,7 @@
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
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
