diff options
| author | Anton-Latukha <anton.latukha@gmail.com> | 2018-12-27 17:14:59 +0200 |
|---|---|---|
| committer | Anton-Latukha <anton.latukha@gmail.com> | 2018-12-27 20:12:14 +0200 |
| commit | 42f660a3a069b77f06d0f379c499b9f470a6d768 (patch) | |
| tree | 5c6700c8148d2d71d01ec9c552f174ce5ea047e1 /pkgs/applications/video/handbrake | |
| parent | 0f83cff8a2c27fb31357ea860ecca6dc99d96fd1 (diff) | |
| download | nixpkgs-42f660a3a069b77f06d0f379c499b9f470a6d768.tar nixpkgs-42f660a3a069b77f06d0f379c499b9f470a6d768.tar.gz nixpkgs-42f660a3a069b77f06d0f379c499b9f470a6d768.tar.bz2 nixpkgs-42f660a3a069b77f06d0f379c499b9f470a6d768.tar.lz nixpkgs-42f660a3a069b77f06d0f379c499b9f470a6d768.tar.xz nixpkgs-42f660a3a069b77f06d0f379c499b9f470a6d768.tar.zst nixpkgs-42f660a3a069b77f06d0f379c499b9f470a6d768.zip | |
handbrake: 1.2.0: add cmake, no cmake conf
Diffstat (limited to 'pkgs/applications/video/handbrake')
| -rw-r--r-- | pkgs/applications/video/handbrake/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 63034b09af7..9d43104364e 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -4,7 +4,7 @@ # { stdenv, lib, fetchurl, - python2, pkgconfig, autoconf, automake, yasm, libtool, m4, + python2, pkgconfig, autoconf, automake, cmake, yasm, libtool, m4, fribidi, fontconfig, freetype, jansson, zlib, libass, libiconv, libsamplerate, libxml2, bzip2, ffmpeg_4, libtheora, x264, x265, libvpx, mpeg2dec, @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - python2 pkgconfig autoconf automake yasm libtool m4 - ] ++ lib.optionals useGtk [ wrapGAppsHook intltool ]; + python2 pkgconfig autoconf automake cmake yasm libtool m4 + ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ]; buildInputs = [ fribidi fontconfig freetype jansson zlib @@ -51,6 +51,10 @@ stdenv.mkDerivation rec { libgudev hicolor-icon-theme ] ++ 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; preConfigure = '' |