From 9b4b21c6abba97773de7c19f31880676684696a5 Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Wed, 18 Apr 2018 20:23:27 +0300 Subject: [PATCH] handbrake: refactor (fx, clenup, description, cosmetics, add maintainer) --- maintainers/maintainer-list.nix | 5 +++++ pkgs/applications/video/handbrake/default.nix | 20 +++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 839458dbfc9..2bb748e0ce6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -28,6 +28,11 @@ github = "AndersonTorres"; name = "Anderson Torres"; }; + Anton-Latukha = { + email = "anton.latuka+nixpkgs@gmail.com"; + github = "Anton-Latukha"; + name = "Anton Latukha"; + }; Baughn = { email = "sveina@gmail.com"; github = "Baughn"; diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 904401c5e91..6ce2ae08eeb 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -37,15 +37,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python2 pkgconfig yasm autoconf automake libtool m4 - ] ++ lib.optionals useGtk [ - intltool wrapGAppsHook - ]; + ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ]; buildInputs = [ fribidi fontconfig freetype jansson zlib libass libiconv libsamplerate libxml2 bzip2 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 [ glib gtk3 libappindicator-gtk3 libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev @@ -60,8 +58,6 @@ stdenv.mkDerivation rec { preConfigure = '' patchShebangs scripts - echo 'TAG=${version}' > version.txt - # `configure` errors out when trying to read the current year which is too low substituteInPlace make/configure.py \ --replace developer release \ @@ -97,13 +93,17 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://handbrake.fr/; - description = "A tool for ripping DVDs into video files"; + description = "A tool for converting video files and ripping DVDs"; longDescription = '' - Handbrake is a versatile transcoding DVD ripper. This package - provides the cli HandbrakeCLI and the GTK+ version ghb. + 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; [ wmertens ]; + maintainers = with maintainers; [ Anton-Latukha wmertens ]; # Not tested on anything else platforms = platforms.linux; };