The nvidia-x11 expression does not build against the latest kernel. The
attached patch to the kernel version detection script fixes the build.
commit 7e7b0b3c62a182fc790f7726698a42bc97169341
Author: Karn Kallio <[email protected]>
Date: Tue Feb 5 18:43:57 2013 -0430
nvidia-x11: patch kernel version detection.
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index e3630db..c965ef0 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation {
builder = ./builder.sh;
+ patches = [ ./version-test.patch ];
+
src =
if stdenv.system == "i686-linux" then
fetchurl {
diff --git a/pkgs/os-specific/linux/nvidia-x11/version-test.patch b/pkgs/os-specific/linux/nvidia-x11/version-test.patch
new file mode 100644
index 0000000..9b6908e
--- /dev/null
+++ b/pkgs/os-specific/linux/nvidia-x11/version-test.patch
@@ -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
_______________________________________________
nix-dev mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-dev
