c4patino/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-06 17:13:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

[Backport release-26.05] ffmpeg_6: drop superfluous patch (#535552)

Browse source
This commit is contained in:
Matt Sturgeon 2026-06-26 11:47:40 +00:00 • committed by GitHub
commit 68afc49b24
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/libraries/ffmpeg/generic.nix
View file

@ -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";