diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2024-01-27 15:28:43 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2024-02-07 20:37:38 +0000 |
| commit | 8f42ee751238c6b8fdd227df330bcc47b5853fae (patch) | |
| tree | fcb1c3e2036becdf702305354e2998f559598f04 /pkgs/development/libraries/ffmpeg | |
| parent | 7f90b56ea122222d295971aee3c95d9f48ee38fe (diff) | |
ffmpeg: backport binutils-2.41 fix
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 0f5d889845669..e5b63f77fb7ce 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -350,6 +350,14 @@ stdenv.mkDerivation (finalAttrs: { ''; patches = map (patch: fetchpatch patch) (extraPatches + ++ (lib.optional (lib.versionOlder version "6.1") + { + # Backport fix for binutils-2.41. + name = "binutils-2.41.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/effadce6c756247ea8bae32dc13bb3e6f464f0eb"; + hash = "sha256-vlBUMJ1bORQHRNpuzc5iXsTWwS/CN5BmGIA8g7H7mJE="; + } + ) ++ (lib.optional (lib.versionAtLeast finalAttrs.version "6" && lib.versionOlder finalAttrs.version "6.1") { # this can be removed post 6.1 name = "fix_aacps_tablegen"; |