From ffdc0742421f22be5e055a77118427793b4eb541 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 30 Nov 2024 11:57:38 +0100 Subject: [PATCH] linuxKernel.packages.linux_6_12.evdi: add support for kernel >= 6.12 --- pkgs/os-specific/linux/evdi/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index e65790ef26080..411eef88eb764 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, kernel, libdrm, python3, @@ -16,15 +17,22 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "evdi"; - version = "1.14.7"; + version = "1.14.7-unstable-2024-11-30"; src = fetchFromGitHub { owner = "DisplayLink"; repo = "evdi"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-z3GawjaokbmmUC1LihwGSnF3tUp9n/FO+kDiWvBq+mY="; + rev = "59a3a864f7476cd61d9c65bfd012d1e9ed90e2b1"; + hash = "sha256-0xEh0Tb5QFReW5lXO/Mb3gn1z87+baR8Tix+dQjUZMw="; }; + patches = [ + (fetchpatch { + url = "https://github.com/DisplayLink/evdi/commit/e41240cf62d7188643bc95e5d69e1c4cfa6ddb84.patch?full_index=1"; + hash = "sha256-6V3QJZMAhXqfGLW2eWkIzJnOdBPvLLNVzg6DW1M3IaA="; + }) + ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error" "-Wno-error=discarded-qualifiers" # for Linux 4.19 compatibility @@ -60,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; meta = { - broken = kernel.kernelOlder "4.19" || kernel.kernelAtLeast "6.12"; + broken = kernel.kernelOlder "4.19"; changelog = "https://github.com/DisplayLink/evdi/releases/tag/v${finalAttrs.version}"; description = "Extensible Virtual Display Interface"; homepage = "https://www.displaylink.com/";