ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-21 04:42:07 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #141961 from sbruder/vapoursynth-r57

Browse Source 
vapoursynth: add fixes for API v4/R55+
This commit is contained in:
Michele Guerini Rocco 2021-10-20 08:36:29 +02:00 committed by GitHub
commit bb208438df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,21 +2,19 @@
, runCommandCC, runCommand, vapoursynth, writeText, patchelf, buildEnv
, zimg, libass, python3, libiconv
, ApplicationServices
, ocrSupport ? false, tesseract
, imwriSupport ? true, imagemagick
}:
with lib;
stdenv.mkDerivation rec {
pname = "vapoursynth";
version = "R55";
version = "R57";
src = fetchFromGitHub {
owner = "vapoursynth";
repo = "vapoursynth";
rev = version;
sha256 = "sha256-91lPknNX3NM3NraIcPAR478paPoYvgjgCOIcdgaR5nE=";
sha256 = "sha256-tPQ1SOIpFevOYzL9a8Lc5+dv2egVX1CY3km8yWVv+Sk=";
};
patches = [
@ -27,14 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = [
zimg libass
(python3.withPackages (ps: with ps; [ sphinx cython ]))
] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ]
++ optional ocrSupport tesseract
++ optional imwriSupport imagemagick;
configureFlags = [
(optionalString (!ocrSupport) "--disable-ocr")
(optionalString (!imwriSupport) "--disable-imwri")
];
] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ];
enableParallelBuilding = true;
@ -54,6 +45,10 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/vspipe \
--prefix PYTHONPATH : $out/${python3.sitePackages}
# VapourSynth does not include any plugins by default
# and emits a warning when the system plugin directory does not exist.
mkdir $out/lib/vapoursynth
'';
meta = with lib; {

12
pkgs/development/libraries/vapoursynth/editor.nix
View File

@ -1,4 +1,4 @@
{ lib, mkDerivation, fetchFromBitbucket, makeWrapper, runCommand
{ lib, mkDerivation, fetchFromGitHub, makeWrapper, runCommand
, python3, vapoursynth
, qmake, qtbase, qtwebsockets
}:
@ -6,13 +6,13 @@
let
unwrapped = mkDerivation rec {
pname = "vapoursynth-editor";
version = "R19";
version = "R19-mod-4";
src = fetchFromBitbucket {
owner = "mystery_keeper";
src = fetchFromGitHub {
owner = "YomikoR";
repo = pname;
rev = lib.toLower version;
sha256 = "1zlaynkkvizf128ln50yvzz3b764f5a0yryp6993s9fkwa7djb6n";
sha256 = "sha256-+/9j9DJDGXbuTvE8ZXIu6wjcof39SyatS36Q6y9hLPg=";
};
nativeBuildInputs = [ qmake ];
@ -35,7 +35,7 @@ let
meta = with lib; {
description = "Cross-platform editor for VapourSynth scripts";
homepage = "https://bitbucket.org/mystery_keeper/vapoursynth-editor";
homepage = "https://github.com/YomikoR/VapourSynth-Editor";
license = licenses.mit;
maintainers = with maintainers; [ tadeokondrak ];
platforms = platforms.all;