From 3f9661588ba94b7e9151a4b6c1becfe3d8424def Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 12 Sep 2017 04:10:32 +0200 Subject: [PATCH] vapoursynth: R36 -> R38 --- .../libraries/vapoursynth/default.nix | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index ae43307cf31..fde27e1cafa 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -1,40 +1,43 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, - glibc, zimg, imagemagick, libass, yasm, python3, - ocrSupport ? false, tesseract + zimg, libass, yasm, python3, + ocrSupport ? false, tesseract, + imwriSupport? true, imagemagick7 }: -assert ocrSupport -> tesseract != null; +assert ocrSupport -> tesseract != null; +assert imwriSupport -> imagemagick7 != null; with stdenv.lib; stdenv.mkDerivation rec { name = "vapoursynth-${version}"; - version = "R36"; + version = "R38"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = version; - sha256 = "10yiccj7yd4bd3a6k15xahb5y3ymcagyaqavh0wal2rwzfck9k8c"; + sha256 = "0nabl6949s7awy7rnr4ck52v50xr0hwr280fyzsqixgp8w369jn0"; }; buildInputs = [ pkgconfig autoreconfHook - zimg imagemagick libass glibc tesseract yasm + zimg libass tesseract yasm (python3.withPackages (ps: with ps; [ sphinx cython ])) - ] ++ optional ocrSupport tesseract; + ] ++ optional ocrSupport tesseract + ++ optional imwriSupport imagemagick7; configureFlags = [ - "--enable-imwri" "--disable-static" - (optionalString (!ocrSupport) "--disable-ocr") + (optionalString (!ocrSupport) "--disable-ocr") + (optionalString (!imwriSupport) "--disable-imwri") ]; - meta = { + meta = with stdenv.lib; { description = "A video processing framework with the future in mind"; - homepage = http://www.vapoursynth.com/; - license = licenses.lgpl21; - platforms = platforms.unix; + homepage = http://www.vapoursynth.com/; + license = licenses.lgpl21; + platforms = platforms.unix; maintainers = with maintainers; [ rnhmjoj ]; };