nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-05 19:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #326249 from afh/fix-ffmpeg4

Browse Source 
ffmpeg_4: fix build issue introduced by texinfo 7.1 update
This commit is contained in:
Atemu 2024-07-18 21:10:09 +02:00 committed by GitHub
commit 04df2885de
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/ffmpeg/generic.nix
View File

@ -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.
@ -723,7 +723,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 = []