diff options
| author | Robert Schütz <dev@schuetz-co.de> | 2021-02-27 18:36:56 +0100 |
|---|---|---|
| committer | Robert Schütz <dev@schuetz-co.de> | 2021-02-27 18:36:56 +0100 |
| commit | 10ba3c20a7bdd6021511338b1f01465cfc9b3bee (patch) | |
| tree | 2bfbf8de3a4699cda317c2f52c7e65d364c033eb /pkgs/development/libraries/vapoursynth/default.nix | |
| parent | 5cc881d0d827b4c3f273b5021a7c0b94c112368f (diff) | |
| download | nixpkgs-10ba3c20a7bdd6021511338b1f01465cfc9b3bee.tar nixpkgs-10ba3c20a7bdd6021511338b1f01465cfc9b3bee.tar.gz nixpkgs-10ba3c20a7bdd6021511338b1f01465cfc9b3bee.tar.bz2 nixpkgs-10ba3c20a7bdd6021511338b1f01465cfc9b3bee.tar.lz nixpkgs-10ba3c20a7bdd6021511338b1f01465cfc9b3bee.tar.xz nixpkgs-10ba3c20a7bdd6021511338b1f01465cfc9b3bee.tar.zst nixpkgs-10ba3c20a7bdd6021511338b1f01465cfc9b3bee.zip | |
treewide: replace imagemagick7 with imagemagick
Diffstat (limited to 'pkgs/development/libraries/vapoursynth/default.nix')
| -rw-r--r-- | pkgs/development/libraries/vapoursynth/default.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 4265948c195..8ef209fe805 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -2,13 +2,10 @@ , runCommandCC, runCommand, vapoursynth, writeText, patchelf, buildEnv , zimg, libass, python3, libiconv , ApplicationServices -, ocrSupport ? false, tesseract ? null -, imwriSupport? true, imagemagick7 ? null +, ocrSupport ? false, tesseract +, imwriSupport ? true, imagemagick }: -assert ocrSupport -> tesseract != null; -assert imwriSupport -> imagemagick7 != null; - with lib; stdenv.mkDerivation rec { @@ -32,7 +29,7 @@ stdenv.mkDerivation rec { (python3.withPackages (ps: with ps; [ sphinx cython ])) ] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ] ++ optional ocrSupport tesseract - ++ optional imwriSupport imagemagick7; + ++ optional imwriSupport imagemagick; configureFlags = [ (optionalString (!ocrSupport) "--disable-ocr") |