diff options
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index c965ef01c72b..660676865b07 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl +{ stdenv, fetchurl, kernelDev ? null, xlibs, zlib, perl , gtk, atk, pango, glib, gdk_pixbuf , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit @@ -8,10 +8,10 @@ with stdenv.lib; -let versionNumber = "310.32"; in +let versionNumber = "313.30"; in stdenv.mkDerivation { - name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; + name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernelDev.version}"}"; builder = ./builder.sh; @@ -21,18 +21,18 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "13dc2s312h4k4bp7qb2ymdafr739jxbh0f3h1ilrkyjkd945cgnl"; + sha256 = "1ba9mphvynni44dv3mwx9a9819drmrc4n82f4i58xjhvkfbi03qa"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "1wk0lcm712glffdmwpk4drrwb0fjva7qhpxylnqs7fl7d3acnsvq"; + sha256 = "1ggd3raxax99xnbphf945f0ggj5kq30jnknhyqy2fha9is1jbnjp"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; inherit versionNumber libsOnly; - kernel = if libsOnly then null else kernel; + kernel = if libsOnly then null else kernelDev; dontStrip = true; @@ -50,6 +50,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.nvidia.com/object/unix.html; description = "X.org driver and kernel module for NVIDIA graphics cards"; - license = "unfree"; + license = stdenv.lib.licenses.unfreeRedistributable; }; } |