alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nvidia-x11: fix build with the latest Linux kernel

Browse source
This commit is contained in:
Karn Kallio 2013-02-06 10:46:25 +01:00 committed by Peter Simons
parent 30658882e8
commit f921baec94
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/os-specific/linux/nvidia-x11/default.nix
View file

@ -15,6 +15,8 @@ stdenv.mkDerivation {
builder = ./builder.sh;
patches = [ ./version-test.patch ];
src =
if stdenv.system == "i686-linux" then
fetchurl {

19
pkgs/os-specific/linux/nvidia-x11/version-test.patch Normal file
View file

@ -0,0 +1,19 @@
diff -Naur NVIDIA-Linux-x86_64-310.32-no-compat32/kernel/conftest.sh NVIDIA-patched/kernel/conftest.sh
--- NVIDIA-Linux-x86_64-310.32-no-compat32/kernel/conftest.sh 2013-01-14 18:11:17.000000000 -0430
+++ NVIDIA-patched/kernel/conftest.sh 2013-02-05 14:44:50.757999124 -0430
@@ -1699,11 +1699,13 @@
# kernel older than 2.6.6, that's all we require to
# build the module.
#
+ VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3)
PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3)
SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3)
- if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
- -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
+ if [ -n "$VERSION" -a -n "$PATCHLEVEL" -a -n "$SUBLEVEL" \
+ -a "$VERSION" -ge 3 -o "$VERSION" -eq 2 -a "$PATCHLEVEL" -ge 7 \
+ -o "$PATCHLEVEL" -eq 6 -a "$SUBLEVEL" -ge 6 ]; then
SELECTED_MAKEFILE=Makefile.kbuild
RET=0
fi