diff options
| author | Florian Klink <flokli@flokli.de> | 2019-05-25 19:36:51 +0200 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2019-05-26 10:58:34 +0200 |
| commit | 00263c9306107f3ff79ecd185d7e0712fb0560d8 (patch) | |
| tree | db0f748212f07a53c7d8cf68014d0f7c5b09bf3a /pkgs/os-specific/linux/nvidia-x11 | |
| parent | f0adad2d01a436c8b7072d126259dc41610d87c6 (diff) | |
| download | nixpkgs-00263c9306107f3ff79ecd185d7e0712fb0560d8.tar nixpkgs-00263c9306107f3ff79ecd185d7e0712fb0560d8.tar.gz nixpkgs-00263c9306107f3ff79ecd185d7e0712fb0560d8.tar.bz2 nixpkgs-00263c9306107f3ff79ecd185d7e0712fb0560d8.tar.lz nixpkgs-00263c9306107f3ff79ecd185d7e0712fb0560d8.tar.xz nixpkgs-00263c9306107f3ff79ecd185d7e0712fb0560d8.tar.zst nixpkgs-00263c9306107f3ff79ecd185d7e0712fb0560d8.zip | |
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
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11')
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch | 24 |
2 files changed, 9 insertions, 25 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index ff0416b4efc..934a7a10033 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -41,7 +41,15 @@ rec { settingsSha256 = "0n4pj8dzkr7ccwrn5p46mn59cnijdhg8zmn3idjzrk56pq0hbgjr"; persistencedSha256 = "0bnjr0smhlwlqpyg9m6lca3b7brl2mw8aypc6p7525dn9d9kv6kb"; - patches = lib.optional (kernel.meta.branch == "4.19") ./drm_mode_connector.patch; + patches = [ + (fetchurl { + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel-4.16.patch?h=2ad07241ea525a6b6b555b6cb96a97634a4b2cb0"; + sha256 = "11b3dp0na496rn13v5q4k66bf61174800g36rcwj42r0xj9cfak2"; + }) + (fetchurl { + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel-5.1.patch?h=42d50ef8d6048608d18bdf2c296dd335260c5a1a"; + sha256 = "03v46ym2bcckg9q2xrilkg21hfiwypr6gl4jmly2q3m4yza9ja6r"; + })]; }; legacy_340 = generic { diff --git a/pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch b/pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch deleted file mode 100644 index 58cf06fae45..00000000000 --- a/pkgs/os-specific/linux/nvidia-x11/drm_mode_connector.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ura a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c ---- a/kernel/nvidia-drm/nvidia-drm-connector.c 2018-09-07 17:38:31.807453997 -0400 -+++ b/kernel/nvidia-drm/nvidia-drm-connector.c 2018-09-07 17:39:22.446185824 -0400 -@@ -226,7 +226,7 @@ - - - if (nv_connector->edid != NULL) { -- drm_mode_connector_update_edid_property( -+ drm_connector_update_edid_property( - connector, nv_connector->edid); - } - -diff -ura a/kernel/nvidia-drm/nvidia-drm-encoder.c b/kernel/nvidia-drm/nvidia-drm-encoder.c ---- a/kernel/nvidia-drm/nvidia-drm-encoder.c 2018-09-07 17:38:31.807453997 -0400 -+++ b/kernel/nvidia-drm/nvidia-drm-encoder.c 2018-09-07 17:39:35.083798484 -0400 -@@ -216,7 +216,7 @@ - - /* Attach encoder and connector */ - -- ret = drm_mode_connector_attach_encoder(connector, encoder); -+ ret = drm_connector_attach_encoder(connector, encoder); - - if (ret != 0) { - NV_DRM_DEV_LOG_ERR( |