summary refs log tree commit diff
path: root/pkgs/applications/video
diff options
context:
space:
mode:
authorWout Mertens <Wout.Mertens@gmail.com>2019-10-24 16:21:48 +0200
committerGitHub <noreply@github.com>2019-10-24 16:21:48 +0200
commitc98a006c7eea979a535dddb22d7550c7518da90b (patch)
treeede95023548aadb143af268b3a5c48ae5bb96f12 /pkgs/applications/video
parentbecfba9512c68b013ac62f5adb0ffc2d96c5132e (diff)
parentd51e366ffee3bef79f39a541bdc3acf6d84cf149 (diff)
downloadnixpkgs-c98a006c7eea979a535dddb22d7550c7518da90b.tar
nixpkgs-c98a006c7eea979a535dddb22d7550c7518da90b.tar.gz
nixpkgs-c98a006c7eea979a535dddb22d7550c7518da90b.tar.bz2
nixpkgs-c98a006c7eea979a535dddb22d7550c7518da90b.tar.lz
nixpkgs-c98a006c7eea979a535dddb22d7550c7518da90b.tar.xz
nixpkgs-c98a006c7eea979a535dddb22d7550c7518da90b.tar.zst
nixpkgs-c98a006c7eea979a535dddb22d7550c7518da90b.zip
Merge pull request #71851 from acowley/handbrake-samplerate
handbrake: fix missing audio
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r--pkgs/applications/video/handbrake/default.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index 2e216369de9..e8a81a192b5 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