Merge pull request #124563 from acowley/handbrake-ffmpeg-4_4

handbrake: fix audio when linking with ffmpeg-4.4
This commit is contained in:
Wout Mertens 2021-05-28 18:27:51 +02:00 committed by GitHub
commit d0063d5aff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -7,7 +7,7 @@
# be nice to add the native GUI (and/or the GTK GUI) as an option too, but that
# requires invoking the Xcode build system, which is non-trivial for now.
{ stdenv, lib, fetchFromGitHub,
{ stdenv, lib, fetchFromGitHub, fetchpatch,
# Main build tools
pkg-config, autoconf, automake, libtool, m4, xz, python3,
numactl,
@ -58,6 +58,15 @@ stdenv.mkDerivation rec {
'';
};
# Remove with a release after 1.3.3
patches = [
(fetchpatch {
name = "audio-fix-ffmpeg-4_4";
url = "https://github.com/HandBrake/HandBrake/commit/f28289fb06ab461ea082b4be56d6d1504c0c31c2.patch";
sha256 = "sha256:1zcwa4h97d8wjspb8kbd8b1jg0a9vvmv9zaphzry4m9q0bj3h3kz";
})
];
# we put as little as possible in src.extraPostFetch as it's much easier to
# add to it here without having to fiddle with src.sha256
# only DATE and HASH are absolutely necessary