tjh.dev
linuxPackages.nvidia_x11_legacy390: use patches from archlinux
Those seem to have gotten outdated, and don't build on current kernels
anymore.
Reported-In: https://github.com/NixOS/nixpkgs/issues/62012
(cherry picked from commit 00263c9306107f3ff79ecd185d7e0712fb0560d8)
+9
-1
pkgs/os-specific/linux/nvidia-x11/default.nix
+9
-1
pkgs/os-specific/linux/nvidia-x11/default.nix
···
36
36
settingsSha256 = "0n4pj8dzkr7ccwrn5p46mn59cnijdhg8zmn3idjzrk56pq0hbgjr";
37
37
persistencedSha256 = "0bnjr0smhlwlqpyg9m6lca3b7brl2mw8aypc6p7525dn9d9kv6kb";
38
38
39
-
patches = lib.optional (kernel.meta.branch == "4.19") ./drm_mode_connector.patch;
39
+
patches = [
40
+
(fetchurl {
41
+
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel-4.16.patch?h=2ad07241ea525a6b6b555b6cb96a97634a4b2cb0";
42
+
sha256 = "11b3dp0na496rn13v5q4k66bf61174800g36rcwj42r0xj9cfak2";
43
+
})
44
+
(fetchurl {
45
+
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel-5.1.patch?h=42d50ef8d6048608d18bdf2c296dd335260c5a1a";
46
+
sha256 = "03v46ym2bcckg9q2xrilkg21hfiwypr6gl4jmly2q3m4yza9ja6r";
47
+
})];
40
48
};
41
49
42
50
legacy_340 = generic {
-24
pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch
-24
pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch
···
1
-
diff -ura a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c
2
-
--- a/kernel/nvidia-drm/nvidia-drm-connector.c 2018-09-07 17:38:31.807453997 -0400
3
-
+++ b/kernel/nvidia-drm/nvidia-drm-connector.c 2018-09-07 17:39:22.446185824 -0400
4
-
@@ -226,7 +226,7 @@
5
-
6
-
7
-
if (nv_connector->edid != NULL) {
8
-
- drm_mode_connector_update_edid_property(
9
-
+ drm_connector_update_edid_property(
10
-
connector, nv_connector->edid);
11
-
}
12
-
13
-
diff -ura a/kernel/nvidia-drm/nvidia-drm-encoder.c b/kernel/nvidia-drm/nvidia-drm-encoder.c
14
-
--- a/kernel/nvidia-drm/nvidia-drm-encoder.c 2018-09-07 17:38:31.807453997 -0400
15
-
+++ b/kernel/nvidia-drm/nvidia-drm-encoder.c 2018-09-07 17:39:35.083798484 -0400
16
-
@@ -216,7 +216,7 @@
17
-
18
-
/* Attach encoder and connector */
19
-
20
-
- ret = drm_mode_connector_attach_encoder(connector, encoder);
21
-
+ ret = drm_connector_attach_encoder(connector, encoder);
22
-
23
-
if (ret != 0) {
24
-
NV_DRM_DEV_LOG_ERR(