Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: becfba9512c6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c98a006c7eea
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 23, 2019

  1. 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.
    @acowley
    acowley committed Oct 23, 2019
    Copy the full SHA
    d51e366 View commit details

Commits on Oct 24, 2019

  1. Merge pull request #71851 from acowley/handbrake-samplerate 

    handbrake: fix missing audio
    @wmertens
    wmertens authored Oct 24, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c98a006 View commit details
Showing with 8 additions and 1 deletion.
  1. +8 −1 pkgs/applications/video/handbrake/default.nix
9 changes: 8 additions & 1 deletion pkgs/applications/video/handbrake/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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