mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 06:31:02 +00:00
099c13da1b
* substitute(): --subst-var was silently coercing to "" if the variable does not exist. * libffi: simplify using `checkInputs` * pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix * utillinux: 2.32 -> 2.32.1 https://lkml.org/lkml/2018/7/16/532 * busybox: 1.29.0 -> 1.29.1 * bind: 9.12.1-P2 -> 9.12.2 https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html * curl: 7.60.0 -> 7.61.0 * gvfs: make tests run, but disable * ilmbase: disable tests on i686. Spooky! * mdds: fix tests * git: disable checks as tests are run in installcheck * ruby: disable tests * libcommuni: disable checks as tests are run in installcheck * librdf: make tests run, but disable * neon, neon_0_29: make tests run, but disable * pciutils: 3.6.0 -> 3.6.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions. * mesa: more include fixes mostly from void-linux (thanks!) * npth: 1.5 -> 1.6 minor bump * boost167: Add lockfree next_prior patch * stdenv: cleanup darwin bootstrapping Also gets rid of the full python and some of it's dependencies in the stdenv build closure. * Revert "pciutils: use standardized equivalent for canonicalize_file_name" This reverts commitf8db20fb3a. Patching should no longer be needed with 3.6.1. * binutils-wrapper: Try to avoid adding unnecessary -L flags (cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9) Signed-off-by: Domen Kožar <domen@dev.si> * libffi: don't check on darwin libffi usages in stdenv broken darwin. We need to disable doCheck for that case. * "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook * python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273 When `py.test` was run with a folder as argument, it would not only search for tests in that folder, but also create a .pytest-cache folder. Not only is this state we don't want, but it was also causing collisions. * parity-ui: fix after merge * python.pkgs.pytest-flake8: disable test, fix build * Revert "meson: 0.46.1 -> 0.47.0" With meson 0.47.0 (or 0.47.1, or git) things are very wrong re:rpath handling resulting in at best missing libs but even corrupt binaries :(. When we run patchelf it masks the problem by removing obviously busted paths. Which is probably why this wasn't noticed immediately. Unfortunately the binary already has a long series of paths scribbled in a space intended for a much smaller string; in my testing it was something like lengths were 67 with 300+ written to it. I think we've reported the relevant issues upstream, but unfortunately it appears our patches are what introduces the overwrite/corruption (by no longer being correct in what they assume) This doesn't look so bad to fix but it's not something I can spend more time on at the moment. -- Interestingly the overwritten string data (because it is scribbled past the bounds) remains in the binary and is why we're suddenly seeing unexpected references in various builds -- notably this is is the reason we're seeing the "extra-utils" breakage that entirely crippled NixOS on master (and probably on staging before?). Fixes #43650. This reverts commit305ac4dade. (cherry picked from commit273d68eff8) Signed-off-by: Domen Kožar <domen@dev.si>
101 lines
3.3 KiB
Nix
101 lines
3.3 KiB
Nix
# Upstream distributes HandBrake with bundle of according versions of libraries and patches to them.
|
|
#
|
|
# Derivation patches HandBrake to use our closure.
|
|
#
|
|
|
|
{ stdenv, lib, fetchurl,
|
|
python2, pkgconfig, yasm, zlib,
|
|
autoconf, automake, libtool, m4, jansson,
|
|
libass, libiconv, libsamplerate, fribidi, libxml2, bzip2,
|
|
libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec,
|
|
lame, libdvdread, libdvdnav, libbluray,
|
|
mp4v2, mpeg2dec, x264, x265, libmkv,
|
|
fontconfig, freetype, hicolor-icon-theme,
|
|
glib, gtk3, intltool, libnotify,
|
|
gst_all_1, dbus-glib, udev, libgudev, libvpx,
|
|
useGtk ? true, wrapGAppsHook ? null, libappindicator-gtk3 ? null,
|
|
useFfmpeg ? false, libav_12 ? null, ffmpeg ? null,
|
|
useFdk ? false, fdk_aac ? null
|
|
}:
|
|
|
|
stdenv.mkDerivation rec {
|
|
# TODO: Release 1.2.0 would switch LibAV to FFmpeg.
|
|
version = "1.1.0";
|
|
name = "handbrake-${version}";
|
|
|
|
src = fetchurl {
|
|
url = ''https://download2.handbrake.fr/${version}/HandBrake-${version}-source.tar.bz2'';
|
|
sha256 = "1nj0ihflisxcfkmsk7fm3b5cn7cpnpg66dk2lkp2ip6qidppqbm0";
|
|
};
|
|
|
|
patched_libav_12 = libav_12.overrideAttrs (super: {
|
|
# NOTE: 2018-04-26: HandBrake compilation (1.1.0) requires a patch of LibAV (12.3) from HandBrake team. This patch not went LibAV upstream.
|
|
patches = (super.patches or []) ++ [(
|
|
fetchurl {
|
|
url = ''https://raw.githubusercontent.com/HandBrake/HandBrake/9e1f245708a157231c427c0ef9b91729d59a30e1/contrib/ffmpeg/A21-mp4-sdtp.patch'';
|
|
sha256 = "14grzyvb1qbb90k31ibabnwmwnrc48ml6h2z0rjamdv83q45jq4g";
|
|
})
|
|
];
|
|
});
|
|
|
|
nativeBuildInputs = [
|
|
python2 pkgconfig yasm autoconf automake libtool m4
|
|
] ++ lib.optionals useGtk [ intltool wrapGAppsHook ];
|
|
|
|
buildInputs = [
|
|
fribidi fontconfig freetype jansson zlib
|
|
libass libiconv libsamplerate libxml2 bzip2
|
|
libogg libopus libtheora libvorbis libdvdcss a52dec libmkv
|
|
lame libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 x265 libvpx
|
|
] ++ lib.optionals useGtk [
|
|
glib gtk3 libappindicator-gtk3 libnotify
|
|
gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev
|
|
libgudev hicolor-icon-theme
|
|
] ++ (if useFfmpeg then [ ffmpeg ] else [ patched_libav_12 ])
|
|
++ lib.optional useFdk fdk_aac;
|
|
|
|
enableParallelBuilding = true;
|
|
|
|
preConfigure = ''
|
|
patchShebangs scripts
|
|
|
|
substituteInPlace libhb/module.defs \
|
|
--replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2
|
|
|
|
# Force using nixpkgs dependencies
|
|
sed -i '/MODULES += contrib/d' make/include/main.defs
|
|
sed -i '/PKG_CONFIG_PATH=/d' gtk/module.rules
|
|
'';
|
|
|
|
configureFlags = [
|
|
"--disable-df-fetch"
|
|
"--disable-df-verify"
|
|
(if useGtk then "--disable-gtk-update-checks" else "--disable-gtk")
|
|
(if useFdk then "--enable-fdk-aac" else "")
|
|
];
|
|
|
|
NIX_LDFLAGS = [
|
|
"-lx265"
|
|
];
|
|
|
|
preBuild = ''
|
|
cd build
|
|
'';
|
|
|
|
meta = with stdenv.lib; {
|
|
homepage = http://handbrake.fr/;
|
|
description = "A tool for converting video files and ripping DVDs";
|
|
longDescription = ''
|
|
Tool for converting and remuxing video files
|
|
into selection of modern and widely supported codecs
|
|
and containers. Very versatile and customizable.
|
|
Package provides:
|
|
CLI - `HandbrakeCLI`
|
|
GTK+ GUI - `ghb`
|
|
'';
|
|
license = licenses.gpl2;
|
|
maintainers = with maintainers; [ Anton-Latukha wmertens ];
|
|
platforms = with platforms; unix;
|
|
};
|
|
}
|