From 71fbf0f65ab46bc4a2a7a581c394ad1c6e98114d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 29 May 2026 09:20:09 -0700
Subject: [PATCH] ffmpeg_6: drop superfluous patch

(cherry picked from commit 5eedf0e5597f412a1024c06d0587d4e0a5a2e99c)
---
 pkgs/development/libraries/ffmpeg/generic.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 06cf679cd2cd3..6c16418a2c517 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -460,14 +460,6 @@ stdenv.mkDerivation (
           hash = "sha256-ulB5BujAkoRJ8VHou64Th3E94z6m+l6v9DpG7/9nYsM=";
         })
       ]
-      ++ optionals (lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") [
-        (fetchpatch2 {
-          # 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=";
-        })
-      ]
       ++ optionals (lib.versionOlder version "7.1.1") [
         (fetchpatch2 {
           name = "texinfo-7.1.patch";