@@ -7,9 +7,9 @@
77# be nice to add the native GUI (and/or the GTK GUI) as an option too, but that
88# requires invoking the Xcode build system, which is non-trivial for now.
99
10−{ stdenv, lib, fetchurl, fetchpatch,
10+{ stdenv, lib, fetchurl,
1111 # Main build tools
12− python2, pkgconfig, autoconf, automake, libtool, m4, lzma,
12+ pkgconfig, autoconf, automake, libtool, m4, lzma, python3,
1313 numactl,
1414 # Processing, video codecs, containers
1515 ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora, dav1d,
@@ -49,15 +49,18 @@ assert stdenv.isDarwin -> AudioToolbox != null && Foundation != null
4949
5050stdenv.mkDerivation rec {
5151 pname = "handbrake";
52− version = "1.3.1";
52+ version = "1.3.2";
5353
5454 src = fetchurl {
55− url = ''https://download.handbrake.fr/releases/${version}/HandBrake-${version}-source.tar.bz2'';
56− sha256 = "09rcrq0kjs1lc1as7w3glbpbfvzldwpx3xv0pfmkn4pl7acxw1f0";
55+ # 2020-05-05: NOTE: Thou fetching from GitHub, still fetchurl required,
56+ # because this tarball has their "special" packaging and so
57+ # internal "special" version information
58+ url = ''https://github.com/HandBrake/HandBrake/releases/download/${version}/HandBrake-${version}-source.tar.bz2'';
59+ sha256 = "0w7jxjrccvxp7g15dv0spildg5apmqp4gwbcqmg58va2gylynvzc";
5760 };
5861
5962 nativeBuildInputs = [
60− python2 pkgconfig autoconf automake libtool m4
63+ pkgconfig autoconf automake libtool m4 python3
6164 ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ];
6265
6366 buildInputs = [
@@ -80,12 +83,9 @@ stdenv.mkDerivation rec {
8083
8184 substituteInPlace libhb/module.defs \
8285 --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2
83− substituteInPlace libhb/module.defs \
84− --replace '$(CONTRIB.build/)include/libxml2' ${libxml2.dev}/include/libxml2
8586
8687 # Force using nixpkgs dependencies
8788 sed -i '/MODULES += contrib/d' make/include/main.defs
88− sed -i '/PKG_CONFIG_PATH=/d' gtk/module.rules
8989 sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \
9090 -e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \
9191 -i make/configure.py