From 56149c246df1b7e846e2ef940c8b236c48de6e77 Mon Sep 17 00:00:00 2001
From: Anton-Latukha <anton.latukha@gmail.com>
Date: Tue, 15 May 2018 17:33:46 +0300
Subject: [PATCH] handbrake: rm dependency on cmake
---
pkgs/applications/video/handbrake/default.nix | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index 9f1dfb2d6b07..e18901ad88d7 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -3,11 +3,9 @@
# Derivation patches HandBrake to use our closure.
#
-# TODO: Release 1.2.0 would switch LibAV to FFmpeg.
-
{ stdenv, lib, fetchurl,
python2, pkgconfig, yasm, harfbuzz, zlib,
- autoconf, automake, cmake, libtool, m4, jansson,
+ autoconf, automake, libtool, m4, jansson,
libass, libiconv, libsamplerate, fribidi, libxml2, bzip2,
libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec,
lame, libdvdread, libdvdnav, libbluray,
@@ -21,6 +19,7 @@
}:
stdenv.mkDerivation rec {
+ # TODO: Release 1.2.0 would switch LibAV to FFmpeg.
version = "1.1.0";
name = "handbrake-${version}";
@@ -40,7 +39,7 @@ stdenv.mkDerivation rec {
});
nativeBuildInputs = [
- cmake python2 pkgconfig yasm autoconf automake libtool m4
+ python2 pkgconfig yasm autoconf automake libtool m4
] ++ lib.optionals useGtk [ intltool wrapGAppsHook ];
buildInputs = [
@@ -55,8 +54,6 @@ stdenv.mkDerivation rec {
] ++ (if useFfmpeg then [ ffmpeg ] else [ patched_libav_12 ])
++ lib.optional useFdk fdk_aac;
- dontUseCmakeConfigure = true;
-
enableParallelBuilding = true;
preConfigure = ''