summary refs log tree commit diff
path: root/pkgs/os-specific/linux/nvidia-x11/generic.nix
diff options
context:
space:
mode:
authorVictor Calvert <calvertvl@users.noreply.github.com>2017-04-16 16:08:20 -0400
committerVladimír Čunát <vcunat@gmail.com>2017-04-16 22:08:20 +0200
commit71d8ce6f4be68731b9a43e545323d6d9be0ed229 (patch)
treeb84aa31fa4f4f34415a0c91faf5acc0d8d22d48e /pkgs/os-specific/linux/nvidia-x11/generic.nix
parent002a2b479a245d10691a394454f29e27d95de719 (diff)
downloadnixpkgs-71d8ce6f4be68731b9a43e545323d6d9be0ed229.tar
nixpkgs-71d8ce6f4be68731b9a43e545323d6d9be0ed229.tar.gz
nixpkgs-71d8ce6f4be68731b9a43e545323d6d9be0ed229.tar.bz2
nixpkgs-71d8ce6f4be68731b9a43e545323d6d9be0ed229.tar.lz
nixpkgs-71d8ce6f4be68731b9a43e545323d6d9be0ed229.tar.xz
nixpkgs-71d8ce6f4be68731b9a43e545323d6d9be0ed229.tar.zst
nixpkgs-71d8ce6f4be68731b9a43e545323d6d9be0ed229.zip
nvidia: 340.101 -> 340.102 (#24694)
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11/generic.nix')
-rw-r--r--pkgs/os-specific/linux/nvidia-x11/generic.nix14
1 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index e4e67a6abfd..44a96f9bc0d 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -43,8 +43,20 @@ let
       else throw "nvidia-x11 does not support platform ${stdenv.system}";
 
     # patch to get the nvidia and nvidiaBeta driver to compile on kernel 4.10
-    patches = if libsOnly || versionOlder version "375"
+    patches = if libsOnly
               then null
+              else if versionOlder version "340"
+              then null
+              else if versionOlder version "375"
+              then [
+                     (fetchurl {
+                         url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/4.10.0_kernel.patch?h=packages/nvidia-340xx;
+                         sha256 = "08k2phr9kawg6a3v88d4zkj7gdlih29gm5a1gmhpgmvd926k0z5l";
+                     })
+                         # from https://git.archlinux.org/svntogit/packages.git/plain/trunk/fs52243.patch?h=packages/nvidia-340xx
+                         # with datestamps removed
+                     ./fs52243.patch
+                   ]
               else [ (fetchurl {
                       url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel_4.10.patch?h=packages/nvidia;  sha256 = "0zhpx3baq2pca2pmz1af5cp2nzjxjx0j9w5xrdy204mnv3v2708z";
                      }) ];