From caed71efb655d0a73ba6355e0292541de381cf69 Mon Sep 17 00:00:00 2001 From: Alexey Lebedeff Date: Mon, 3 Dec 2018 16:14:16 +0100 Subject: [PATCH] nvidia_legacy_340: Remove unneeded/failing patch The patch is not applying and no longer needed after upgrade in 045575e744cd581a20929c63590d9b555099c22d. Now the same result is achieved by the following lines in the driver package itself: #if defined(NV_DRM_LEGACY_PCI_INIT_PRESENT) #define nv_drm_pci_init drm_legacy_pci_init #define nv_drm_pci_exit drm_legacy_pci_exit #else #define nv_drm_pci_init drm_pci_init #define nv_drm_pci_exit drm_pci_exit #endif --- pkgs/os-specific/linux/nvidia-x11/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 016d03a61f8..aa604cd9776 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -47,7 +47,7 @@ rec { persistencedSha256 = "0nwv6kh4gxgy80x1zs6gcg5hy3amg25xhsfa2v4mwqa36sblxz6l"; useGLVND = false; - patches = maybePatch_drm_legacy ++ [ ./vm_operations_struct-fault.patch ]; + patches = [ ./vm_operations_struct-fault.patch ]; }; legacy_304 = generic {