mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
imagemagick: add curl dependency
This commit is contained in:
parent
d9b6b8a849
commit
5a6b995479
1 changed files with 51 additions and 12 deletions
|
@ -1,9 +1,36 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, pkg-config, libtool
|
{ lib
|
||||||
, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre
|
, stdenv
|
||||||
, lcms2, openexr, libjxl, libpng, liblqr1, libraw, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif
|
, fetchFromGitHub
|
||||||
, potrace, ApplicationServices
|
, pkg-config
|
||||||
|
, libtool
|
||||||
|
, bzip2
|
||||||
|
, zlib
|
||||||
|
, libX11
|
||||||
|
, libXext
|
||||||
|
, libXt
|
||||||
|
, fontconfig
|
||||||
|
, freetype
|
||||||
|
, ghostscript
|
||||||
|
, libjpeg
|
||||||
|
, djvulibre
|
||||||
|
, lcms2
|
||||||
|
, openexr
|
||||||
|
, libjxl
|
||||||
|
, libpng
|
||||||
|
, liblqr1
|
||||||
|
, libraw
|
||||||
|
, librsvg
|
||||||
|
, libtiff
|
||||||
|
, libxml2
|
||||||
|
, openjpeg
|
||||||
|
, libwebp
|
||||||
|
, libheif
|
||||||
|
, potrace
|
||||||
|
, curl
|
||||||
|
, ApplicationServices
|
||||||
, Foundation
|
, Foundation
|
||||||
, testVersion, imagemagick
|
, testVersion
|
||||||
|
, imagemagick
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -41,7 +68,8 @@ stdenv.mkDerivation rec {
|
||||||
# let's disable it for now to unbreak the imagemagick build.
|
# let's disable it for now to unbreak the imagemagick build.
|
||||||
++ lib.optional (libjxl != null && !stdenv.isAarch64) "--with-jxl"
|
++ lib.optional (libjxl != null && !stdenv.isAarch64) "--with-jxl"
|
||||||
++ lib.optionals (ghostscript != null)
|
++ lib.optionals (ghostscript != null)
|
||||||
[ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts"
|
[
|
||||||
|
"--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts"
|
||||||
"--with-gslib"
|
"--with-gslib"
|
||||||
]
|
]
|
||||||
++ lib.optionals stdenv.hostPlatform.isMinGW
|
++ lib.optionals stdenv.hostPlatform.isMinGW
|
||||||
|
@ -51,8 +79,19 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [ pkg-config libtool ];
|
nativeBuildInputs = [ pkg-config libtool ];
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ zlib fontconfig freetype ghostscript potrace
|
[
|
||||||
liblqr1 libpng libraw libtiff libxml2 libheif djvulibre
|
zlib
|
||||||
|
fontconfig
|
||||||
|
freetype
|
||||||
|
ghostscript
|
||||||
|
potrace
|
||||||
|
liblqr1
|
||||||
|
libpng
|
||||||
|
libraw
|
||||||
|
libtiff
|
||||||
|
libxml2
|
||||||
|
libheif
|
||||||
|
djvulibre
|
||||||
]
|
]
|
||||||
# libjxl is broken on aarch64 (see meta.broken in libjxl) for now,
|
# libjxl is broken on aarch64 (see meta.broken in libjxl) for now,
|
||||||
# let's disable it for now to unbreak the imagemagick build.
|
# let's disable it for now to unbreak the imagemagick build.
|
||||||
|
@ -66,7 +105,7 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs =
|
propagatedBuildInputs =
|
||||||
[ bzip2 freetype libjpeg lcms2 ]
|
[ bzip2 freetype libjpeg lcms2 curl ]
|
||||||
++ lib.optionals (!stdenv.hostPlatform.isMinGW)
|
++ lib.optionals (!stdenv.hostPlatform.isMinGW)
|
||||||
[ libX11 libXext libXt libwebp ]
|
[ libX11 libXext libXt libwebp ]
|
||||||
;
|
;
|
||||||
|
|
Loading…
Reference in a new issue