From d3776acea69d3c72bab50162531295cef642979f Mon Sep 17 00:00:00 2001
From: Edoardo Signorini <mail@edoars.me>
Date: Mon, 24 Aug 2026 10:09:38 +0200
Subject: [PATCH 1/2] linuxPackages.evdi: 1.14.15 -> 1.15.0

(cherry picked from commit aaaed3094022326cd2d8f4f7448d90a7bca69ac1)
---
 pkgs/os-specific/linux/evdi/default.nix            | 14 +++++++-------
 .../linux/evdi/fix-conftest-probes.patch           | 10 ++++++++++
 2 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/os-specific/linux/evdi/fix-conftest-probes.patch

diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix
index b6c5b6fdd2fb..38ea0890f98f 100644
--- a/pkgs/os-specific/linux/evdi/default.nix
+++ b/pkgs/os-specific/linux/evdi/default.nix
@@ -7,7 +7,6 @@
   libdrm,
   python3,
 }:
-
 let
   python3WithLibs = python3.withPackages (
     ps: with ps; [
@@ -17,19 +16,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "evdi";
-  version = "1.14.15";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "DisplayLink";
     repo = "evdi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tms+UNws+oBmwLvDFaDSIa/bUdSpK+CADodbsip3tRg=";
+    hash = "sha256-CXF7PvmrPjjNoWXbWxEkFE/Sw4bO6YqDplPwF/OxhB0=";
   };
 
-  prePatch = ''
-    substituteInPlace module/Makefile \
-      --replace-fail '/etc/os-release' '/dev/null'
-  '';
+  patches = [
+    # Fix feature probes on kernels with allocation profiling enabled.
+    # Upstream: https://github.com/DisplayLink/evdi/pull/592
+    ./fix-conftest-probes.patch
+  ];
 
   env.CFLAGS = toString [
     "-Wno-error"
diff --git a/pkgs/os-specific/linux/evdi/fix-conftest-probes.patch b/pkgs/os-specific/linux/evdi/fix-conftest-probes.patch
new file mode 100644
index 000000000000..8022eaf08181
--- /dev/null
+++ b/pkgs/os-specific/linux/evdi/fix-conftest-probes.patch
@@ -0,0 +1,10 @@
+--- a/module/conftest.sh
++++ b/module/conftest.sh
+@@ -32,6 +32,7 @@
+ 	done
+ }
+ CFLAGS=$(requote "$@")
++CFLAGS="$CFLAGS '-DKBUILD_MODNAME=\"conftest\"' '-DKBUILD_BASENAME=\"conftest\"'"
+ 
+ WORKDIR="$(mktemp -d)"
+ trap 'rm -rf "$WORKDIR"' EXIT

From 7ab8216164104a05683db8721a1f186384708f18 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Sep 2026 10:41:47 +0000
Subject: [PATCH 2/2] linuxPackages.evdi: 1.15.0 -> 1.15.1

(cherry picked from commit 1b031436f0042ad97712bcb9878f1974684422e6)
---
 pkgs/os-specific/linux/evdi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix
index 38ea0890f98f..723a496581a8 100644
--- a/pkgs/os-specific/linux/evdi/default.nix
+++ b/pkgs/os-specific/linux/evdi/default.nix
@@ -16,13 +16,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "evdi";
-  version = "1.15.0";
+  version = "1.15.1";
 
   src = fetchFromGitHub {
     owner = "DisplayLink";
     repo = "evdi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CXF7PvmrPjjNoWXbWxEkFE/Sw4bO6YqDplPwF/OxhB0=";
+    hash = "sha256-3g6OETXJSf6AScJ2K9F67mPlh3Wpi20Yq+f+xe78p9Y=";
   };
 
   patches = [