From 2f3cf5830971b64a38c2b0bd7068026da92477f4 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Tue, 3 Jul 2018 17:12:27 +0200 Subject: Revert "vapoursynth: fix build" This reverts commit ad611a622374b3a2202684eda61e3f3207e5d3e1. A better fix was committed directly afterwards in 2afe06c18ffabf9a66c928d947549dcb54fff450 --- pkgs/development/libraries/vapoursynth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/vapoursynth/default.nix') diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 74f8598c314..7344f3a7e2b 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook , zimg, libass, python3, libiconv -, ApplicationServices, nasm, x265 +, ApplicationServices, nasm , ocrSupport ? false, tesseract ? null , imwriSupport? true, imagemagick7 ? null }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { (python3.withPackages (ps: with ps; [ sphinx cython ])) ] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ] ++ optional ocrSupport tesseract - ++ optionals imwriSupport [ imagemagick7 x265 ]; + ++ optional imwriSupport imagemagick7; configureFlags = [ "--disable-static" -- cgit 1.4.1