* NVIDIA driver updated to 173.14.12.
svn path=/nixpkgs/trunk/; revision=12537
This commit is contained in:
parent
ee17d755ca
commit
5030b79f44
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
versionNumber = "173.14.05";
|
versionNumber = "173.14.12";
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
@ -15,17 +15,15 @@ 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}-pkg1.run";
|
url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg1.run";
|
||||||
sha256 = "14r3zddrppd0zxq76dd08dlj4qqncr7fj9cnrny4f0b5d0qgrd3f";
|
sha256 = "0a4i4a7vk0j7z52d2pg92f8wnlabd4r6v19qxdrr8nhgm0imjh78";
|
||||||
}
|
}
|
||||||
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}-pkg2.run";
|
url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg2.run";
|
||||||
sha256 = "0dmgn5a0432zkhgh0d5xs2h0sq5di2iaqybrj5f1vb2ghayams1y";
|
sha256 = "01hyyb5s7xc7108gy9cr7zkrfccfnpzqpipfygx9fikxyjb1vmig";
|
||||||
}
|
}
|
||||||
else throw "nvidia-x11 does not support platform ${stdenv.system}";
|
else throw "nvidia-x11 does not support platform ${stdenv.system}";
|
||||||
|
|
||||||
#xenPatch = ./nvidia-2.6.24-xen.patch;
|
|
||||||
|
|
||||||
inherit versionNumber kernel;
|
inherit versionNumber kernel;
|
||||||
|
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
@ -37,4 +35,9 @@ stdenv.mkDerivation {
|
|||||||
programPath = stdenv.lib.makeLibraryPath [
|
programPath = stdenv.lib.makeLibraryPath [
|
||||||
gtkLibs.gtk gtkLibs.atk gtkLibs.pango gtkLibs.glib xlibs.libXv
|
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 NVIDIA graphics cards";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,5 +0,0 @@
|
|||||||
#! /bin/sh -e
|
|
||||||
|
|
||||||
insmod $(nix-showOutPath.sh nvidiaDrivers)/src/nv/nvidia.ko
|
|
||||||
|
|
||||||
#initctl start xserver
|
|
@ -5254,6 +5254,7 @@ let pkgs = rec {
|
|||||||
# Build the kernel modules for the some of the kernels.
|
# Build the kernel modules for the some of the kernels.
|
||||||
kernelPackages_2_6_23 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_23);
|
kernelPackages_2_6_23 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_23);
|
||||||
kernelPackages_2_6_25 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_25);
|
kernelPackages_2_6_25 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_25);
|
||||||
|
kernelPackages_2_6_26 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_26);
|
||||||
|
|
||||||
# The current default kernel / kernel modules.
|
# The current default kernel / kernel modules.
|
||||||
kernelPackages = kernelPackages_2_6_23;
|
kernelPackages = kernelPackages_2_6_23;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user