avidemux: backport binutils-2.41 fix for bundled ffmpeg
This commit is contained in:
parent
cce58ee24d
commit
fa4285b1ad
1 changed files with 11 additions and 1 deletions
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, lib, fetchurl, cmake, pkg-config
|
||||
{ stdenv, lib, fetchurl, fetchpatch, cmake, pkg-config
|
||||
, zlib, gettext, libvdpau, libva, libXv, sqlite
|
||||
, yasm, freetype, fontconfig, fribidi
|
||||
, makeWrapper, libXext, libGLU, qttools, qtbase, wrapQtAppsHook
|
||||
|
@ -37,6 +37,16 @@ stdenv.mkDerivation rec {
|
|||
./bootstrap_logging.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
cp ${fetchpatch {
|
||||
# Backport fix for binutils-2.41.
|
||||
name = "binutils-2.41.patch";
|
||||
url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/effadce6c756247ea8bae32dc13bb3e6f464f0eb";
|
||||
hash = "sha256-s9PcYbt0mFb2wvgMcFL1J+2OS6Sxyd2wYkGzLr2qd9M=";
|
||||
stripLen = 1;
|
||||
}} avidemux_core/ffmpeg_package/patches/
|
||||
'';
|
||||
|
||||
nativeBuildInputs =
|
||||
[ yasm cmake pkg-config makeWrapper ]
|
||||
++ lib.optional withQT wrapQtAppsHook;
|
||||
|
|
Loading…
Reference in a new issue