treewide: replace imagemagick7 with imagemagick
This commit is contained in:
parent
5cc881d0d8
commit
10ba3c20a7
@ -5,7 +5,7 @@
|
|||||||
, callPackage
|
, callPackage
|
||||||
|
|
||||||
, python3
|
, python3
|
||||||
, imagemagick7
|
, imagemagick
|
||||||
, ghostscript
|
, ghostscript
|
||||||
, optipng
|
, optipng
|
||||||
, tesseract
|
, tesseract
|
||||||
@ -65,7 +65,7 @@ let
|
|||||||
|
|
||||||
buildPhase = let
|
buildPhase = let
|
||||||
# Paperless has explicit runtime checks that expect these binaries to be in PATH
|
# 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 ''
|
in ''
|
||||||
${python.interpreter} -m compileall $srcDir
|
${python.interpreter} -m compileall $srcDir
|
||||||
|
|
||||||
|
@ -2,13 +2,10 @@
|
|||||||
, runCommandCC, runCommand, vapoursynth, writeText, patchelf, buildEnv
|
, runCommandCC, runCommand, vapoursynth, writeText, patchelf, buildEnv
|
||||||
, zimg, libass, python3, libiconv
|
, zimg, libass, python3, libiconv
|
||||||
, ApplicationServices
|
, ApplicationServices
|
||||||
, ocrSupport ? false, tesseract ? null
|
, ocrSupport ? false, tesseract
|
||||||
, imwriSupport? true, imagemagick7 ? null
|
, imwriSupport ? true, imagemagick
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert ocrSupport -> tesseract != null;
|
|
||||||
assert imwriSupport -> imagemagick7 != null;
|
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -32,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||||||
(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
|
||||||
++ optional imwriSupport imagemagick7;
|
++ optional imwriSupport imagemagick;
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
(optionalString (!ocrSupport) "--disable-ocr")
|
(optionalString (!ocrSupport) "--disable-ocr")
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ buildPecl, fetchpatch, lib, imagemagick7, pkg-config, pcre' }:
|
{ buildPecl, fetchpatch, lib, imagemagick, pkg-config, pcre' }:
|
||||||
|
|
||||||
buildPecl {
|
buildPecl {
|
||||||
pname = "imagick";
|
pname = "imagick";
|
||||||
@ -19,7 +19,7 @@ buildPecl {
|
|||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
configureFlags = [ "--with-imagick=${imagemagick7.dev}" ];
|
configureFlags = [ "--with-imagick=${imagemagick.dev}" ];
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
buildInputs = [ pcre' ];
|
buildInputs = [ pcre' ];
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{ lib
|
{ lib
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchPypi
|
, fetchPypi
|
||||||
, imagemagick7Big
|
, imagemagickBig
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
@ -16,13 +16,13 @@ buildPythonPackage rec {
|
|||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace wand/api.py --replace \
|
substituteInPlace wand/api.py --replace \
|
||||||
"magick_home = os.environ.get('MAGICK_HOME')" \
|
"magick_home = os.environ.get('MAGICK_HOME')" \
|
||||||
"magick_home = '${imagemagick7Big}'"
|
"magick_home = '${imagemagickBig}'"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# tests not included with pypi release
|
# tests not included with pypi release
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
passthru.imagemagick = imagemagick7Big;
|
passthru.imagemagick = imagemagickBig;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Ctypes-based simple MagickWand API binding for Python";
|
description = "Ctypes-based simple MagickWand API binding for Python";
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{ lib, callPackage, python3Packages, fetchFromGitLab, cacert,
|
{ lib, callPackage, python3Packages, fetchFromGitLab, cacert,
|
||||||
rustPlatform, bubblewrap, git, perlPackages, imagemagick7, fetchurl, fetchzip,
|
rustPlatform, bubblewrap, git, perlPackages, imagemagick, fetchurl, fetchzip,
|
||||||
jre, makeWrapper, tr-patcher, tes3cmd }:
|
jre, makeWrapper, tr-patcher, tes3cmd }:
|
||||||
|
|
||||||
let
|
let
|
||||||
@ -29,7 +29,7 @@ let
|
|||||||
python3Packages.virtualenv
|
python3Packages.virtualenv
|
||||||
tr-patcher
|
tr-patcher
|
||||||
tes3cmd
|
tes3cmd
|
||||||
imagemagick7
|
imagemagick
|
||||||
];
|
];
|
||||||
|
|
||||||
in
|
in
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, pkgs, makeWrapper, haskellPackages, haskell, pandoc, imagemagick7 }:
|
{ lib, pkgs, makeWrapper, haskellPackages, haskell, pandoc, imagemagick }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
with haskell.lib;
|
with haskell.lib;
|
||||||
@ -29,7 +29,7 @@ justStaticExecutables (overrideCabal ldgallery-compiler (oldAttrs: {
|
|||||||
|
|
||||||
# wrapper for runtime dependencies registration
|
# wrapper for runtime dependencies registration
|
||||||
wrapProgram "$out/bin/ldgallery" \
|
wrapProgram "$out/bin/ldgallery" \
|
||||||
--prefix PATH : ${lib.makeBinPath [ imagemagick7 ]}
|
--prefix PATH : ${lib.makeBinPath [ imagemagick ]}
|
||||||
|
|
||||||
# bash completion
|
# bash completion
|
||||||
mkdir -p "$out/share/bash-completion/completions"
|
mkdir -p "$out/share/bash-completion/completions"
|
||||||
|
Loading…
Reference in New Issue
Block a user