From 365f08378bd300940bb9b426cad1979a894ab919 Mon Sep 17 00:00:00 2001 From: Anton Latukha Date: Thu, 12 Apr 2018 12:50:28 +0300 Subject: [PATCH] handbrake: add FDK as option (#38809) --- pkgs/applications/video/handbrake/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 3e796275907c..1c97f9531f79 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -13,13 +13,13 @@ python2, pkgconfig, yasm, harfbuzz, zlib, autoconf, automake, cmake, libtool, m4, jansson, libass, libiconv, libsamplerate, fribidi, libxml2, bzip2, - libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec, fdk_aac, + libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec, lame, ffmpeg, 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 + useGtk ? true, wrapGAppsHook ? null, libappindicator-gtk3 ? null, useFdk ? false, fdk_aac ? null }: stdenv.mkDerivation rec { @@ -42,13 +42,13 @@ stdenv.mkDerivation rec { buildInputs = [ fribidi fontconfig freetype jansson zlib libass libiconv libsamplerate libxml2 bzip2 - libogg libopus libtheora libvorbis libdvdcss a52dec libmkv fdk_aac + libogg libopus libtheora libvorbis libdvdcss a52dec libmkv lame ffmpeg 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 - ]); + ]) ++ (lib.optionals useFdk [fdk_aac]); dontUseCmakeConfigure = true; @@ -75,8 +75,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-df-fetch" "--disable-df-verify" - "--enable-fdk-aac" (if useGtk then "--disable-gtk-update-checks" else "--disable-gtk") + (if useFdk then "--enable-fdk-aac" else "") ]; NIX_LDFLAGS = [