JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #31289 from rnhmjoj/vapour

Browse Source 
vapoursynth: R38 -> R39
This commit is contained in:
Orivej Desh 2017-11-05 20:25:45 +00:00 committed by GitHub
commit 1130f1eaf6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/vapoursynth/default.nix
View File

@ -1,7 +1,8 @@
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook
zimg, libass, yasm, python3, libiconv, ApplicationServices, , zimg, libass, python3, libiconv
ocrSupport ? false, tesseract, , ApplicationServices, nasm
imwriSupport? true, imagemagick7 , ocrSupport ? false, tesseract
, imwriSupport? true, imagemagick7
}: }:
assert ocrSupport -> tesseract != null; assert ocrSupport -> tesseract != null;
@ -11,18 +12,18 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "vapoursynth-${version}"; name = "vapoursynth-${version}";
version = "R38"; version = "R39";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vapoursynth"; owner = "vapoursynth";
repo = "vapoursynth"; repo = "vapoursynth";
rev = version; rev = version;
sha256 = "0nabl6949s7awy7rnr4ck52v50xr0hwr280fyzsqixgp8w369jn0"; sha256 = "0cw7w8xiwhxhwykydy13m44wm9vn9hrsi30z6017ngga9d84fhqy";
}; };
nativeBuildInputs = [ pkgconfig autoreconfHook ]; nativeBuildInputs = [ pkgconfig autoreconfHook nasm ];
buildInputs = [ buildInputs = [
zimg libass tesseract yasm zimg libass
(python3.withPackages (ps: with ps; [ sphinx cython ])) (python3.withPackages (ps: with ps; [ sphinx cython ]))
] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ] ] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ]
++ optional ocrSupport tesseract ++ optional ocrSupport tesseract