From 1e07a3b40b57bd61617d27d69e5a49730e7dc896 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Thu, 11 Jul 2024 08:04:58 +0200 Subject: [PATCH] ffmpeg_4: fix build issue introduced by texinfo 7.1 update --- pkgs/development/libraries/ffmpeg/generic.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index e74bb1c2348e..0ba1977dfbcf 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, removeReferencesTo, addDriverRunpath, pkg-config, perl, texinfo, yasm +{ lib, stdenv, buildPackages, removeReferencesTo, addDriverRunpath, pkg-config, perl, texinfo, texinfo6, yasm # You can fetch any upstream version using this derivation by specifying version and hash # NOTICE: Always use this argument to override the version. Do not use overrideAttrs. @@ -761,7 +761,9 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ removeReferencesTo addDriverRunpath perl pkg-config texinfo yasm ] + nativeBuildInputs = [ removeReferencesTo addDriverRunpath perl pkg-config yasm ] + # Texinfo version 7.1 introduced breaking changes, which older versions of ffmpeg do not handle. + ++ (if versionOlder version "5" then [ texinfo6 ] else [ texinfo ]) ++ optionals withCudaLLVM [ clang ]; buildInputs = []