From f9390d652f9b1b9d0a5d83e0ff29530acd8729ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 29 Nov 2017 19:03:12 +0100
Subject: [PATCH] nvidia_x11_legacy340: 340.102 -> 340.104

Fixes #32169: build with kernel 4.13.
Unfortunately, 4.13 is going away very soon and for 4.14 doesn't build.

I only tested building it, but these minor bumps should be safe.

(cherry picked from commit 2dfbc5f8ed5b2ad6e6d46e66af15d89a2cb8a7df)
---
 pkgs/os-specific/linux/nvidia-x11/default.nix  | 18 +++++-------------
 .../os-specific/linux/nvidia-x11/fs52243.patch | 14 --------------
 2 files changed, 5 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/nvidia-x11/fs52243.patch

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index ba9b332e6d710b..a2fa4a2e5cde83 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -22,22 +22,14 @@ in
   };
 
   legacy_340 = generic {
-    version = "340.102";
-    sha256_32bit = "0a484i37j00d0rc60q0bp6fd2wfrx2c4r32di9w5svqgmrfkvcb1";
-    sha256_64bit = "0nnz51d48a5fpnnmlz1znjp937k3nshdq46fw1qm8h00dkrd55ib";
-    settingsSha256 = "0nm5c06b09p6wsxpyfaqrzsnal3p1047lk6p4p2a0vksb7id9598";
-    persistencedSha256 = "1jwmggbph9zd8fj4syihldp2a5bxff7q1i2l9c55xz8cvk0rx08i";
+    version = "340.104";
+    sha256_32bit = "1l8w95qpxmkw33c4lsf5ar9w2fkhky4x23rlpqvp1j66wbw1b473";
+    sha256_64bit = "18k65gx6jg956zxyfz31xdp914sq3msn665a759bdbryksbk3wds";
+    settingsSha256 = "1vvpqimvld2iyfjgb9wvs7ca0b0f68jzfdpr0icbyxk4vhsq7sxk";
+    persistencedSha256 = "0zqws2vsrxbxhv6z0nn2galnghcsilcn3s0f70bpm6jqj9wzy7x8";
     useGLVND = false;
 
     patches = [
-      (fetchpatch {
-        name = "kernel-4.10.patch";
-        url = https://git.archlinux.org/svntogit/packages.git/plain/nvidia-340xx/trunk/4.10.0_kernel.patch?id=53fb1df89;
-        sha256 = "171hb57m968qdjcr3h8ppfzhrchf573f39rdja86a1qq1gmrv7pa";
-      })
-      # from https://git.archlinux.org/svntogit/packages.git/plain/trunk/fs52243.patch?h=packages/nvidia-340xx
-      # with datestamps removed
-      ./fs52243.patch
     ];
   };
 
diff --git a/pkgs/os-specific/linux/nvidia-x11/fs52243.patch b/pkgs/os-specific/linux/nvidia-x11/fs52243.patch
deleted file mode 100644
index 212df64fa6159d..00000000000000
--- a/pkgs/os-specific/linux/nvidia-x11/fs52243.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/kernel/nv-drm.c
-+++ b/kernel/nv-drm.c
-@@ -115,7 +115,11 @@
- };
- 
- static struct drm_driver nv_drm_driver = {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
-+    .driver_features = DRIVER_GEM | DRIVER_PRIME | DRIVER_LEGACY,
-+#else
-     .driver_features = DRIVER_GEM | DRIVER_PRIME,
-+#endif
-     .load = nv_drm_load,
-     .unload = nv_drm_unload,
-     .fops = &nv_drm_fops,