diff options
author | Anton Latukha <anton.latukha@gmail.com> | 2018-04-17 22:00:23 +0300 |
---|---|---|
committer | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-04-17 20:00:23 +0100 |
commit | 7e31e4554fccf5ea891bbad6f19b56866c27cd99 (patch) | |
tree | 906b66d1511b44235097d128233a47e5b0268901 | |
parent | d020809398d78579fed67c5781e69bf678f782a5 (diff) | |
download | nixlib-7e31e4554fccf5ea891bbad6f19b56866c27cd99.tar nixlib-7e31e4554fccf5ea891bbad6f19b56866c27cd99.tar.gz nixlib-7e31e4554fccf5ea891bbad6f19b56866c27cd99.tar.bz2 nixlib-7e31e4554fccf5ea891bbad6f19b56866c27cd99.tar.lz nixlib-7e31e4554fccf5ea891bbad6f19b56866c27cd99.tar.xz nixlib-7e31e4554fccf5ea891bbad6f19b56866c27cd99.tar.zst nixlib-7e31e4554fccf5ea891bbad6f19b56866c27cd99.zip |
handbrake: switch to libav_12 (#38811)
-rw-r--r-- | pkgs/applications/video/handbrake/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 1c97f9531f79..904401c5e913 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -14,12 +14,14 @@ autoconf, automake, cmake, libtool, m4, jansson, libass, libiconv, libsamplerate, fribidi, libxml2, bzip2, libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec, - lame, ffmpeg, libdvdread, libdvdnav, libbluray, + 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, useFdk ? false, fdk_aac ? null + useGtk ? true, wrapGAppsHook ? null, libappindicator-gtk3 ? null, + useFfmpeg ? false, libav_12 ? null, ffmpeg ? null, + useFdk ? false, fdk_aac ? null }: stdenv.mkDerivation rec { @@ -35,20 +37,21 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python2 pkgconfig yasm autoconf automake libtool m4 - ] ++ (lib.optionals useGtk [ + ] ++ 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 - ] ++ (lib.optionals useGtk [ + ] ++ lib.optionals useGtk [ glib gtk3 libappindicator-gtk3 libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev libgudev - ]) ++ (lib.optionals useFdk [fdk_aac]); + ] ++ (if useFfmpeg then [ ffmpeg ] else [ libav_12 ]) + ++ lib.optional useFdk fdk_aac; dontUseCmakeConfigure = true; |