JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #39117 from Anton-Latukha/handbrake-rw

Browse Source 
handbrake: refactor (fx, clenup, description, cosmetics, add maintainer)
This commit is contained in:
Wout Mertens 2018-04-23 15:47:23 +02:00 committed by GitHub
commit 7c3dc2f53f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maintainers/maintainer-list.nix
View File

@ -28,6 +28,11 @@
github = "AndersonTorres"; github = "AndersonTorres";
name = "Anderson Torres"; name = "Anderson Torres";
}; };
Anton-Latukha = {
email = "anton.latuka+nixpkgs@gmail.com";
github = "Anton-Latukha";
name = "Anton Latukha";
};
Baughn = { Baughn = {
email = "sveina@gmail.com"; email = "sveina@gmail.com";
github = "Baughn"; github = "Baughn";

20
pkgs/applications/video/handbrake/default.nix
View File

@ -37,15 +37,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake python2 pkgconfig yasm autoconf automake libtool m4 cmake python2 pkgconfig yasm autoconf automake libtool m4
] ++ lib.optionals useGtk [ ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ];
intltool wrapGAppsHook
];
buildInputs = [ buildInputs = [
fribidi fontconfig freetype jansson zlib fribidi fontconfig freetype jansson zlib
libass libiconv libsamplerate libxml2 bzip2 libass libiconv libsamplerate libxml2 bzip2
libogg libopus libtheora libvorbis libdvdcss a52dec libmkv libogg libopus libtheora libvorbis libdvdcss a52dec libmkv
lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 x265 libvpx lame libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 x265 libvpx
] ++ lib.optionals useGtk [ ] ++ lib.optionals useGtk [
glib gtk3 libappindicator-gtk3 libnotify glib gtk3 libappindicator-gtk3 libnotify
gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev
@ -60,8 +58,6 @@ stdenv.mkDerivation rec {
preConfigure = '' preConfigure = ''
patchShebangs scripts patchShebangs scripts
echo 'TAG=${version}' > version.txt
# `configure` errors out when trying to read the current year which is too low # `configure` errors out when trying to read the current year which is too low
substituteInPlace make/configure.py \ substituteInPlace make/configure.py \
--replace developer release \ --replace developer release \
@ -97,13 +93,17 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://handbrake.fr/; homepage = http://handbrake.fr/;
description = "A tool for ripping DVDs into video files"; description = "A tool for converting video files and ripping DVDs";
longDescription = '' longDescription = ''
Handbrake is a versatile transcoding DVD ripper. This package Tool for converting and remuxing video files
provides the cli HandbrakeCLI and the GTK+ version ghb. into selection of modern and widely supported codecs
and containers. Very versatile and customizable.
Package provides:
CLI - `HandbrakeCLI`
GTK+ GUI - `ghb`
''; '';
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ wmertens ]; maintainers = with maintainers; [ Anton-Latukha wmertens ];
# Not tested on anything else # Not tested on anything else
platforms = platforms.linux; platforms = platforms.linux;
}; };