parent
bba575ff7a
commit
d39c6ceffc
@ -11,7 +11,8 @@ let
|
||||
# FIXME: should introduce an option like
|
||||
# ‘hardware.video.nvidia.package’ for overriding the default NVIDIA
|
||||
# driver.
|
||||
enabled = elem "nvidia" drivers || elem "nvidiaLegacy173" drivers || elem "nvidiaLegacy304" drivers;
|
||||
enabled = elem "nvidia" drivers || elem "nvidiaLegacy173" drivers
|
||||
|| elem "nvidiaLegacy304" drivers || elem "nvidiaLegacy340" drivers;
|
||||
|
||||
nvidia_x11 =
|
||||
if elem "nvidia" drivers then
|
||||
@ -20,6 +21,8 @@ let
|
||||
config.boot.kernelPackages.nvidia_x11_legacy173
|
||||
else if elem "nvidiaLegacy304" drivers then
|
||||
config.boot.kernelPackages.nvidia_x11_legacy304
|
||||
else if elem "nvidiaLegacy340" drivers then
|
||||
config.boot.kernelPackages.nvidia_x11_legacy340
|
||||
else throw "impossible";
|
||||
|
||||
in
|
||||
|
@ -1,6 +1,6 @@
|
||||
{stdenv, fetchurl, kernel, xlibs, zlib, gtk, atk, pango, glib, gdk_pixbuf}:
|
||||
|
||||
let
|
||||
let
|
||||
|
||||
versionNumber = "173.14.39";
|
||||
|
||||
@ -8,9 +8,9 @@ in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "nvidia-x11-${versionNumber}-${kernel.version}";
|
||||
|
||||
builder = ./builder-legacy.sh;
|
||||
|
||||
|
||||
builder = ./builder-legacy173.sh;
|
||||
|
||||
src =
|
||||
if stdenv.system == "i686-linux" then
|
||||
fetchurl {
|
||||
|
@ -13,14 +13,17 @@ assert (!libsOnly) -> kernel != null;
|
||||
let
|
||||
|
||||
versionNumber = "340.58";
|
||||
|
||||
/* This branch is needed for G8x, G9x, and GT2xx GPUs, and motherboard chipsets based on them.
|
||||
Ongoing support for new Linux kernels and X servers, as well as fixes for critical bugs,
|
||||
will be included in 340.* legacy releases through the end of 2019.
|
||||
*/
|
||||
inherit (stdenv.lib) makeLibraryPath;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}";
|
||||
|
||||
builder = ./builder.sh;
|
||||
builder = ./builder-legacy340.sh;
|
||||
|
||||
src =
|
||||
if stdenv.system == "i686-linux" then
|
@ -8294,10 +8294,11 @@ let
|
||||
|
||||
nvidiabl = callPackage ../os-specific/linux/nvidiabl { };
|
||||
|
||||
nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { };
|
||||
nvidia_x11 = self.nvidia_x11_legacy340;
|
||||
|
||||
nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { };
|
||||
nvidia_x11_legacy304 = callPackage ../os-specific/linux/nvidia-x11/legacy304.nix { };
|
||||
nvidia_x11_legacy340 = callPackage ../os-specific/linux/nvidia-x11/legacy340.nix { };
|
||||
|
||||
openafsClient = callPackage ../servers/openafs-client { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user