diff --git a/pkgs/os-specific/linux/nvidia/builder.sh b/pkgs/os-specific/linux/nvidia/builder.sh index c1ef5d5efd3..9d12a5ba134 100755 --- a/pkgs/os-specific/linux/nvidia/builder.sh +++ b/pkgs/os-specific/linux/nvidia/builder.sh @@ -78,9 +78,13 @@ ln -sf /usr/lib/libglx.la libglx.la; ln -sf /usr/lib/libglx.so.1 libglx.so; ln -sf /usr/lib/libglx.so.1 libglx.so.1; ln -sf /usr/lib/nvidia_drv.so nvidia_drv.so; -ln -sf $out/src/nv/nvidia.ko $kernelOutPath/lib/modules/*-default/kernel/drivers/video/nvidia/nvidia.ko; -rm /var/run/opengl-driver -ln -sf /var/run/opengl-driver $out + +rm /var/run/opengl-driver; +ln -sf /var/run/opengl-driver $out; + +kerneldrvnvpath=$kernelOutPath/lib/modules/*-default/kernel/drivers/video/nvidia; +echo TODO kerneldrvnvpath: \$kerneldrvnvpath +#ln -sf $out/src/nv/nvidia.ko \$kerneldrvnvpath/nvidia.ko; " #TODO ADD ln -sf is sometimes not strong enough ... diff --git a/pkgs/os-specific/linux/nvidia/default.nix b/pkgs/os-specific/linux/nvidia/default.nix index 6ebb7f22c0c..d4f1c8ac9bc 100644 --- a/pkgs/os-specific/linux/nvidia/default.nix +++ b/pkgs/os-specific/linux/nvidia/default.nix @@ -12,18 +12,21 @@ let - versionNumber = "100.14.11"; #important ! to also update this if the sources are updated, this is used as follows: extensions/libglx.so.$versionNumber + versionNumber = "100.14.19"; #important ! to also update this if the sources are updated, this is used as follows: extensions/libglx.so.$versionNumber in stdenv.mkDerivation { name = "nvidiaDrivers-" + versionNumber; builder = ./builder.sh; + nvidiasrc = fetchurl { #we cannot use $src since this variable is also used in the nvidia sources #url = http://www.denbreejen.net/public/nixos/NVIDIA-Linux-x86-1.0-9755-pkg1.run; #sha256 = "1985373866b1dcae80f3da66dbbbd3c28ad76e75a620865be321ee870ad9d1ea"; - url = http://us.download.nvidia.com/XFree86/Linux-x86/100.14.11/NVIDIA-Linux-x86-100.14.11-pkg1.run; - sha256 = "8665370e590328cc5bf3d13737739a80dacbfb6844436cab03c992e84bf16b0c"; + #url = http://us.download.nvidia.com/XFree86/Linux-x86/100.14.11/NVIDIA-Linux-x86-100.14.11-pkg1.run; + #sha256 = "8665370e590328cc5bf3d13737739a80dacbfb6844436cab03c992e84bf16b0c"; + url = http://us.download.nvidia.com/XFree86/Linux-x86/100.14.19/NVIDIA-Linux-x86-100.14.19-pkg1.run; + sha256 = "4dc97d8ff5340954f3cd446093636261c54b147e9721eb295574207d79e9a7e7"; }; inherit versionNumber;