From 02e4b5ffa42982cb80d2eecc62ae1a090fe5c345 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Tue, 24 Aug 2010 21:56:47 +0000 Subject: Adding another nvidia legacy driver. (they have one more, '71'). I use their major numbers to distinguish. They seem to do so in http://www.nvidia.com/object/unix.html . svn path=/nixpkgs/trunk/; revision=23411 --- pkgs/os-specific/linux/nvidia-x11/legacy.nix | 45 ------------------------- pkgs/os-specific/linux/nvidia-x11/legacy173.nix | 45 +++++++++++++++++++++++++ pkgs/os-specific/linux/nvidia-x11/legacy96.nix | 45 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 4 files changed, 92 insertions(+), 46 deletions(-) delete mode 100644 pkgs/os-specific/linux/nvidia-x11/legacy.nix create mode 100644 pkgs/os-specific/linux/nvidia-x11/legacy173.nix create mode 100644 pkgs/os-specific/linux/nvidia-x11/legacy96.nix diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy.nix b/pkgs/os-specific/linux/nvidia-x11/legacy.nix deleted file mode 100644 index 23356b58d32..00000000000 --- a/pkgs/os-specific/linux/nvidia-x11/legacy.nix +++ /dev/null @@ -1,45 +0,0 @@ -{stdenv, fetchurl, kernel, xlibs, gtkLibs, zlib}: - -let - - versionNumber = "96.43.18"; - -in - -stdenv.mkDerivation { - name = "nvidia-x11-${versionNumber}-${kernel.version}"; - - builder = ./builder-legacy.sh; - - src = - if stdenv.system == "i686-linux" then - fetchurl { - url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run"; - sha256 = "0ajlr5vmjgjl2rszzd86099p3fa4xcpy182pwibraggvzchi9ayw"; - } - 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}-pkg0.run"; - sha256 = "0s8iq5djacqr686wd4g7fv8s9hpp2vbjnav82nqca18zanjj20rr"; - } - else throw "nvidia-x11 does not support platform ${stdenv.system}"; - - inherit versionNumber kernel; - - dontStrip = true; - - glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; - - cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc]; - - programPath = stdenv.lib.makeLibraryPath [ - gtkLibs.gtk gtkLibs.atk gtkLibs.pango gtkLibs.glib - xlibs.libXv - ]; - - meta = { - homepage = http://www.nvidia.com/object/unix.html; - description = "X.org driver and kernel module for Legacy NVIDIA graphics cards"; - license = "unfree"; - }; -} diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix new file mode 100644 index 00000000000..638f2e4360e --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix @@ -0,0 +1,45 @@ +{stdenv, fetchurl, kernel, xlibs, gtkLibs, zlib}: + +let + + versionNumber = "173.14.27"; + +in + +stdenv.mkDerivation { + name = "nvidia-x11-${versionNumber}-${kernel.version}"; + + builder = ./builder-legacy.sh; + + src = + if stdenv.system == "i686-linux" then + fetchurl { + url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run"; + sha256 = "08l3zs7sb8n4vjm1vg3yy1pkj54dq7gfrjashlqwbznaa2cdwknb"; + } + 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}-pkg0.run"; + sha256 = "0pmg5whpk0rmzg8zb7qq2imva2hf346c4pvpz5sjir6346350blw"; + } + else throw "nvidia-x11 does not support platform ${stdenv.system}"; + + inherit versionNumber kernel; + + dontStrip = true; + + glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; + + cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc]; + + programPath = stdenv.lib.makeLibraryPath [ + gtkLibs.gtk gtkLibs.atk gtkLibs.pango gtkLibs.glib + xlibs.libXv + ]; + + meta = { + homepage = http://www.nvidia.com/object/unix.html; + description = "X.org driver and kernel module for Legacy NVIDIA graphics cards"; + license = "unfree"; + }; +} diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy96.nix b/pkgs/os-specific/linux/nvidia-x11/legacy96.nix new file mode 100644 index 00000000000..23356b58d32 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/legacy96.nix @@ -0,0 +1,45 @@ +{stdenv, fetchurl, kernel, xlibs, gtkLibs, zlib}: + +let + + versionNumber = "96.43.18"; + +in + +stdenv.mkDerivation { + name = "nvidia-x11-${versionNumber}-${kernel.version}"; + + builder = ./builder-legacy.sh; + + src = + if stdenv.system == "i686-linux" then + fetchurl { + url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run"; + sha256 = "0ajlr5vmjgjl2rszzd86099p3fa4xcpy182pwibraggvzchi9ayw"; + } + 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}-pkg0.run"; + sha256 = "0s8iq5djacqr686wd4g7fv8s9hpp2vbjnav82nqca18zanjj20rr"; + } + else throw "nvidia-x11 does not support platform ${stdenv.system}"; + + inherit versionNumber kernel; + + dontStrip = true; + + glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; + + cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc]; + + programPath = stdenv.lib.makeLibraryPath [ + gtkLibs.gtk gtkLibs.atk gtkLibs.pango gtkLibs.glib + xlibs.libXv + ]; + + meta = { + homepage = http://www.nvidia.com/object/unix.html; + description = "X.org driver and kernel module for Legacy NVIDIA graphics cards"; + license = "unfree"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a94391c467..2fdbb9aa008 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4614,7 +4614,8 @@ let nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; - nvidia_x11_legacy = callPackage ../os-specific/linux/nvidia-x11/legacy.nix { }; + nvidia_x11_legacy96 = callPackage ../os-specific/linux/nvidia-x11/legacy96.nix { }; + nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { }; openafsClient = callPackage ../servers/openafs-client { }; -- cgit 1.4.1