From 55eedde6183c48cab437a0f2036e264996b8efdc Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Tue, 7 Oct 2025 13:54:15 +0200 Subject: [PATCH 1/2] Revert "libvdpau-va-gl: fix build with cmake4" This reverts commit 1aaad1adbe24fafeeb30b50070ff9e239314ba2b. --- pkgs/by-name/li/libvdpau-va-gl/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/li/libvdpau-va-gl/package.nix b/pkgs/by-name/li/libvdpau-va-gl/package.nix index 80e97c1d9ae3..7741308d9dc1 100644 --- a/pkgs/by-name/li/libvdpau-va-gl/package.nix +++ b/pkgs/by-name/li/libvdpau-va-gl/package.nix @@ -42,8 +42,6 @@ stdenv.mkDerivation rec { libGLU ]; - cmakeFlags = [ "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" ]; - doCheck = false; # fails. needs DRI access meta = with lib; { From d13d8e272cf7b34b2b36673eca73d436c224b603 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 20 Sep 2025 10:49:44 +0100 Subject: [PATCH 2/2] libvdpau-va-gl: pull upstream `cmake-4` fix Without the change the build fails on` staging` as: CMake Error at CMakeLists.txt:2 (cmake_minimum_required): Compatibility with CMake < 3.5 has been removed from CMake. Co-authored-by: Grimmauld --- pkgs/by-name/li/libvdpau-va-gl/package.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/by-name/li/libvdpau-va-gl/package.nix b/pkgs/by-name/li/libvdpau-va-gl/package.nix index 7741308d9dc1..b55f73762ac2 100644 --- a/pkgs/by-name/li/libvdpau-va-gl/package.nix +++ b/pkgs/by-name/li/libvdpau-va-gl/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, pkg-config, libX11, @@ -26,6 +27,25 @@ stdenv.mkDerivation rec { sha256 = "0asndybfv8xb0fx73sjjw5kydqrahqkm6n04lh589pbf18s5qlld"; }; + patches = [ + # cmake-4 compatibility + (fetchpatch { + name = "cmake-4-1.patch"; + url = "https://github.com/i-rinat/libvdpau-va-gl/commit/30c8ac91f3aa2843f7dc1c1d167e09fad447fd91.patch?full_index=1"; + hash = "sha256-PFEqBg3NE0fVFBAW4zdDbh8eBfKyPX3BZ8P2M15Qq5A="; + }) + (fetchpatch { + name = "cmake-4-2.patch"; + url = "https://github.com/i-rinat/libvdpau-va-gl/commit/38c7d8fddb092824cbcdf2b11af519775930cc8b.patch?full_index=1"; + hash = "sha256-XsX/GLIS2Ce7obQJ4uVhLDtTI1TrDAGi3ECxEH6oOFI="; + }) + (fetchpatch { + name = "cmake-4-3.patch"; + url = "https://github.com/i-rinat/libvdpau-va-gl/commit/a845e8720d900e4bcc89e7ee16106ce63b44af0.patch?full_index=1"; + hash = "sha256-lhiZFDR2ytDmo9hQUT35IJS4KL4+nYWAOnxZlj7u3tM="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config