pyrox.dev / nixpkgs
lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #141961 from sbruder/vapoursynth-r57

vapoursynth: add fixes for API v4/R55+

authored by

Michele Guerini Rocco and committed by
GitHub bb208438 efd5f680

+13 -18
+7 -12
pkgs/development/libraries/vapoursynth/default.nix
··· 2 2 , runCommandCC, runCommand, vapoursynth, writeText, patchelf, buildEnv 3 3 , zimg, libass, python3, libiconv 4 4 , ApplicationServices 5 - , ocrSupport ? false, tesseract 6 - , imwriSupport ? true, imagemagick 7 5 }: 8 6 9 7 with lib; 10 8 11 9 stdenv.mkDerivation rec { 12 10 pname = "vapoursynth"; 13 - version = "R55"; 11 + version = "R57"; 14 12 15 13 src = fetchFromGitHub { 16 14 owner = "vapoursynth"; 17 15 repo = "vapoursynth"; 18 16 rev = version; 19 - sha256 = "sha256-91lPknNX3NM3NraIcPAR478paPoYvgjgCOIcdgaR5nE="; 17 + sha256 = "sha256-tPQ1SOIpFevOYzL9a8Lc5+dv2egVX1CY3km8yWVv+Sk="; 20 18 }; 21 19 22 20 patches = [ ··· 27 25 buildInputs = [ 28 26 zimg libass 29 27 (python3.withPackages (ps: with ps; [ sphinx cython ])) 30 - ] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ] 31 - ++ optional ocrSupport tesseract 32 - ++ optional imwriSupport imagemagick; 33 - 34 - configureFlags = [ 35 - (optionalString (!ocrSupport) "--disable-ocr") 36 - (optionalString (!imwriSupport) "--disable-imwri") 37 - ]; 28 + ] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ]; 38 29 39 30 enableParallelBuilding = true; 40 31 ··· 54 45 postInstall = '' 55 46 wrapProgram $out/bin/vspipe \ 56 47 --prefix PYTHONPATH : $out/${python3.sitePackages} 48 + 49 + # VapourSynth does not include any plugins by default 50 + # and emits a warning when the system plugin directory does not exist. 51 + mkdir $out/lib/vapoursynth 57 52 ''; 58 53 59 54 meta = with lib; {
+6 -6
pkgs/development/libraries/vapoursynth/editor.nix
··· 1 - { lib, mkDerivation, fetchFromBitbucket, makeWrapper, runCommand 1 + { lib, mkDerivation, fetchFromGitHub, makeWrapper, runCommand 2 2 , python3, vapoursynth 3 3 , qmake, qtbase, qtwebsockets 4 4 }: ··· 6 6 let 7 7 unwrapped = mkDerivation rec { 8 8 pname = "vapoursynth-editor"; 9 - version = "R19"; 9 + version = "R19-mod-4"; 10 10 11 - src = fetchFromBitbucket { 12 - owner = "mystery_keeper"; 11 + src = fetchFromGitHub { 12 + owner = "YomikoR"; 13 13 repo = pname; 14 14 rev = lib.toLower version; 15 - sha256 = "1zlaynkkvizf128ln50yvzz3b764f5a0yryp6993s9fkwa7djb6n"; 15 + sha256 = "sha256-+/9j9DJDGXbuTvE8ZXIu6wjcof39SyatS36Q6y9hLPg="; 16 16 }; 17 17 18 18 nativeBuildInputs = [ qmake ]; ··· 35 35 36 36 meta = with lib; { 37 37 description = "Cross-platform editor for VapourSynth scripts"; 38 - homepage = "https://bitbucket.org/mystery_keeper/vapoursynth-editor"; 38 + homepage = "https://github.com/YomikoR/VapourSynth-Editor"; 39 39 license = licenses.mit; 40 40 maintainers = with maintainers; [ tadeokondrak ]; 41 41 platforms = platforms.all;