MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

handbrake: 1.2.0: add cmake, no cmake conf

Browse source
This commit is contained in:
Anton-Latukha 2018-12-27 17:14:59 +02:00
parent 0f83cff8a2
commit 42f660a3a0
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,7 @@
# #
{ stdenv, lib, fetchurl, { stdenv, lib, fetchurl,
python2, pkgconfig, autoconf, automake, yasm, libtool, m4, python2, pkgconfig, autoconf, automake, cmake, yasm, libtool, m4,
fribidi, fontconfig, freetype, jansson, zlib, fribidi, fontconfig, freetype, jansson, zlib,
libass, libiconv, libsamplerate, libxml2, bzip2, libass, libiconv, libsamplerate, libxml2, bzip2,
ffmpeg_4, libtheora, x264, x265, libvpx, mpeg2dec, ffmpeg_4, libtheora, x264, x265, libvpx, mpeg2dec,
@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
python2 pkgconfig autoconf automake yasm libtool m4 python2 pkgconfig autoconf automake cmake yasm libtool m4
] ++ lib.optionals useGtk [ wrapGAppsHook intltool ]; ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ];
buildInputs = [ buildInputs = [
fribidi fontconfig freetype jansson zlib fribidi fontconfig freetype jansson zlib
@ -51,6 +51,10 @@ stdenv.mkDerivation rec {
libgudev hicolor-icon-theme libgudev hicolor-icon-theme
] ++ lib.optional useFdk fdk_aac; ] ++ lib.optional useFdk fdk_aac;
# NOTE: 2018-12-25: v1.2.0 now requires cmake dep
# (default distribution bundles&builds 3rd party libs),
# don't trigger cmake build
dontUseCmakeConfigure = true;
enableParallelBuilding = true; enableParallelBuilding = true;
preConfigure = '' preConfigure = ''