treewide: replace imagemagick7 with imagemagick

This commit is contained in:
Robert Schütz 2021-02-27 18:36:56 +01:00
parent 5cc881d0d8
commit 10ba3c20a7
6 changed files with 14 additions and 17 deletions

View file

@ -5,7 +5,7 @@
, callPackage
, python3
, imagemagick7
, imagemagick
, ghostscript
, optipng
, tesseract
@ -65,7 +65,7 @@ let
buildPhase = let
# Paperless has explicit runtime checks that expect these binaries to be in PATH
extraBin = lib.makeBinPath [ imagemagick7 ghostscript optipng tesseract unpaper ];
extraBin = lib.makeBinPath [ imagemagick ghostscript optipng tesseract unpaper ];
in ''
${python.interpreter} -m compileall $srcDir

View file

@ -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")

View file

@ -1,4 +1,4 @@
{ buildPecl, fetchpatch, lib, imagemagick7, pkg-config, pcre' }:
{ buildPecl, fetchpatch, lib, imagemagick, pkg-config, pcre' }:
buildPecl {
pname = "imagick";
@ -19,7 +19,7 @@ buildPecl {
})
];
configureFlags = [ "--with-imagick=${imagemagick7.dev}" ];
configureFlags = [ "--with-imagick=${imagemagick.dev}" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ pcre' ];

View file

@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, imagemagick7Big
, imagemagickBig
}:
buildPythonPackage rec {
@ -16,13 +16,13 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace wand/api.py --replace \
"magick_home = os.environ.get('MAGICK_HOME')" \
"magick_home = '${imagemagick7Big}'"
"magick_home = '${imagemagickBig}'"
'';
# tests not included with pypi release
doCheck = false;
passthru.imagemagick = imagemagick7Big;
passthru.imagemagick = imagemagickBig;
meta = with lib; {
description = "Ctypes-based simple MagickWand API binding for Python";

View file

@ -1,5 +1,5 @@
{ lib, callPackage, python3Packages, fetchFromGitLab, cacert,
rustPlatform, bubblewrap, git, perlPackages, imagemagick7, fetchurl, fetchzip,
rustPlatform, bubblewrap, git, perlPackages, imagemagick, fetchurl, fetchzip,
jre, makeWrapper, tr-patcher, tes3cmd }:
let
@ -29,7 +29,7 @@ let
python3Packages.virtualenv
tr-patcher
tes3cmd
imagemagick7
imagemagick
];
in

View file

@ -1,4 +1,4 @@
{ lib, pkgs, makeWrapper, haskellPackages, haskell, pandoc, imagemagick7 }:
{ lib, pkgs, makeWrapper, haskellPackages, haskell, pandoc, imagemagick }:
with lib;
with haskell.lib;
@ -29,7 +29,7 @@ justStaticExecutables (overrideCabal ldgallery-compiler (oldAttrs: {
# wrapper for runtime dependencies registration
wrapProgram "$out/bin/ldgallery" \
--prefix PATH : ${lib.makeBinPath [ imagemagick7 ]}
--prefix PATH : ${lib.makeBinPath [ imagemagick ]}
# bash completion
mkdir -p "$out/share/bash-completion/completions"