nvidia-x11: Update to 310.32

This commit is contained in:
Eelco Dolstra 2013-02-01 13:57:59 +01:00
parent 789154b119
commit 9670631c75
2 changed files with 6 additions and 3 deletions

View File

@ -48,6 +48,7 @@ installPhase() {
patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.* patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.*
patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.* patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.*
patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.* patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.*
patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.*
if test -z "$libsOnly"; then if test -z "$libsOnly"; then

View File

@ -8,7 +8,7 @@
with stdenv.lib; with stdenv.lib;
let versionNumber = "310.19"; in let versionNumber = "310.32"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
@ -19,12 +19,12 @@ stdenv.mkDerivation {
if stdenv.system == "i686-linux" then if stdenv.system == "i686-linux" then
fetchurl { fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
sha256 = "0bqcg2zlp42msz1pghrpmjy6bw1abm6xxh129m8pz80ydb085l45"; sha256 = "13dc2s312h4k4bp7qb2ymdafr739jxbh0f3h1ilrkyjkd945cgnl";
} }
else if stdenv.system == "x86_64-linux" then else if stdenv.system == "x86_64-linux" then
fetchurl { fetchurl {
url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
sha256 = "0wjwm8m6hakr22xn2fm59abr1by65p987h7jgaa8q5zvmzgrxd87"; sha256 = "1wk0lcm712glffdmwpk4drrwb0fjva7qhpxylnqs7fl7d3acnsvq";
} }
else throw "nvidia-x11 does not support platform ${stdenv.system}"; else throw "nvidia-x11 does not support platform ${stdenv.system}";
@ -38,6 +38,8 @@ stdenv.mkDerivation {
cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc]; cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc];
openclPath = stdenv.lib.makeLibraryPath [zlib];
programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath
[ gtk atk pango glib gdk_pixbuf xlibs.libXv ] ); [ gtk atk pango glib gdk_pixbuf xlibs.libXv ] );