alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

handbrake: rm dependency on cmake

Browse source
This commit is contained in:
Anton-Latukha 2018-05-15 17:33:46 +03:00
parent 640b6359ae
commit 56149c246d
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/applications/video/handbrake/default.nix
View file

@ -3,11 +3,9 @@
# Derivation patches HandBrake to use our closure. # Derivation patches HandBrake to use our closure.
# #
# TODO: Release 1.2.0 would switch LibAV to FFmpeg.
{ stdenv, lib, fetchurl, { stdenv, lib, fetchurl,
python2, pkgconfig, yasm, harfbuzz, zlib, python2, pkgconfig, yasm, harfbuzz, zlib,
autoconf, automake, cmake, libtool, m4, jansson, autoconf, automake, libtool, m4, jansson,
libass, libiconv, libsamplerate, fribidi, libxml2, bzip2, libass, libiconv, libsamplerate, fribidi, libxml2, bzip2,
libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec, libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec,
lame, libdvdread, libdvdnav, libbluray, lame, libdvdread, libdvdnav, libbluray,
@ -21,6 +19,7 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
# TODO: Release 1.2.0 would switch LibAV to FFmpeg.
version = "1.1.0"; version = "1.1.0";
name = "handbrake-${version}"; name = "handbrake-${version}";
@ -40,7 +39,7 @@ stdenv.mkDerivation rec {
}); });
nativeBuildInputs = [ nativeBuildInputs = [
cmake python2 pkgconfig yasm autoconf automake libtool m4 python2 pkgconfig yasm autoconf automake libtool m4
] ++ lib.optionals useGtk [ intltool wrapGAppsHook ]; ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ];
buildInputs = [ buildInputs = [
@ -55,8 +54,6 @@ stdenv.mkDerivation rec {
] ++ (if useFfmpeg then [ ffmpeg ] else [ patched_libav_12 ]) ] ++ (if useFfmpeg then [ ffmpeg ] else [ patched_libav_12 ])
++ lib.optional useFdk fdk_aac; ++ lib.optional useFdk fdk_aac;
dontUseCmakeConfigure = true;
enableParallelBuilding = true; enableParallelBuilding = true;
preConfigure = '' preConfigure = ''