diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index b6c5b6fdd2fba..38ea0890f98f4 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 0000000000000..8022eaf081813 --- /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