From d51e366ffee3bef79f39a541bdc3acf6d84cf149 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Wed, 23 Oct 2019 15:33:08 -0400 Subject: [PATCH] handbrake: fix missing audio We build HandBrake with a newer ffmpeg than upstream expects, triggering a problem where the audio samplerate defaults to zero because HandBrake was not explicitly setting it. This has been fixed in HandBrake upstream, but we must cherry pick this change in order to produce videos with audio until HandBrake 1.3.0 is released. --- pkgs/applications/video/handbrake/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 2e216369de9c..e8a81a192b5a 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -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, fetchurl, +{ stdenv, lib, fetchurl, fetchpatch, # Main build tools python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4, lzma, # Processing, video codecs, containers @@ -81,6 +81,13 @@ stdenv.mkDerivation rec { # cp: cannot create regular file './internal_defaults.json': File exists enableParallelBuilding = false; + # The samplerate patch should be removed when HandBrake 1.3.0 is released + patches = [(fetchpatch { + name = "set-ffmpeg-samplerate.patch"; + url = "https://patch-diff.githubusercontent.com/raw/HandBrake/HandBrake/pull/2126.patch"; + sha256 = "00lds9h27cvyr53qpvv8gbv01hfxdxd8gphxcwbwg8akqrvk9gbf"; + })]; + preConfigure = '' patchShebangs scripts