From 229b4d208a7bff2325f426c32e2e0c8dab93ba38 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 25 Mar 2024 09:05:00 +0300 Subject: [PATCH] ffmpeg: cherry-pick build fix for latest vulkan-headers --- pkgs/development/libraries/ffmpeg/generic.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index bc071539b56b..6ed7dfc7b757 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -394,13 +394,18 @@ stdenv.mkDerivation (finalAttrs: { ''; } ] - ++ (lib.optionals (lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") + ++ (lib.optionals (lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") [ { # this can be removed post 6.1 name = "fix_build_failure_due_to_PropertyKey_EncoderID"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/cb049d377f54f6b747667a93e4b719380c3e9475"; hash = "sha256-sxRXKKgUak5vsQTiV7ge8vp+N22CdTIvuczNgVRP72c="; } - )); + { + name = "fix_vulkan_av1"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/e06ce6d2b45edac4a2df04f304e18d4727417d24"; + hash = "sha256-73mlX1rdJrguw7OXaSItfHtI7gflDrFj+7SepVvvUIg="; + } + ])); configurePlatforms = []; setOutputFlags = false; # Only accepts some of them