mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
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.
This commit is contained in:
parent
85b4a20db3
commit
2dfbc5f8ed
2 changed files with 5 additions and 27 deletions
|
@ -22,22 +22,14 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
legacy_340 = generic {
|
legacy_340 = generic {
|
||||||
version = "340.102";
|
version = "340.104";
|
||||||
sha256_32bit = "0a484i37j00d0rc60q0bp6fd2wfrx2c4r32di9w5svqgmrfkvcb1";
|
sha256_32bit = "1l8w95qpxmkw33c4lsf5ar9w2fkhky4x23rlpqvp1j66wbw1b473";
|
||||||
sha256_64bit = "0nnz51d48a5fpnnmlz1znjp937k3nshdq46fw1qm8h00dkrd55ib";
|
sha256_64bit = "18k65gx6jg956zxyfz31xdp914sq3msn665a759bdbryksbk3wds";
|
||||||
settingsSha256 = "0nm5c06b09p6wsxpyfaqrzsnal3p1047lk6p4p2a0vksb7id9598";
|
settingsSha256 = "1vvpqimvld2iyfjgb9wvs7ca0b0f68jzfdpr0icbyxk4vhsq7sxk";
|
||||||
persistencedSha256 = "1jwmggbph9zd8fj4syihldp2a5bxff7q1i2l9c55xz8cvk0rx08i";
|
persistencedSha256 = "0zqws2vsrxbxhv6z0nn2galnghcsilcn3s0f70bpm6jqj9wzy7x8";
|
||||||
useGLVND = false;
|
useGLVND = false;
|
||||||
|
|
||||||
patches = [
|
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
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -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,
|
|
Loading…
Reference in a new issue