ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 15:27:20 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #83149 from DieracDelta/fix/imagemagick-default

Browse Source 
imagemagick: add liquid rescale build option
This commit is contained in:
Sandro 2021-06-25 19:17:02 +02:00 committed by GitHub
commit 6b4b3deaed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/graphics/ImageMagick/6.x.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, libtool { lib, stdenv, fetchFromGitHub, pkg-config, libtool
, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre
, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265 , lcms2, openexr, libpng, liblqr1, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265
, ApplicationServices, Foundation , ApplicationServices, Foundation
}: }:
@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
[ "--with-frozenpaths" ] [ "--with-frozenpaths" ]
++ (if arch != null then [ "--with-gcc-arch=${arch}" ] else [ "--without-gcc-arch" ]) ++ (if arch != null then [ "--with-gcc-arch=${arch}" ] else [ "--without-gcc-arch" ])
++ lib.optional (librsvg != null) "--with-rsvg" ++ lib.optional (librsvg != null) "--with-rsvg"
++ lib.optional (liblqr1 != null) "--with-lqr"
++ 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"
@ -46,7 +47,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ zlib fontconfig freetype ghostscript [ zlib fontconfig freetype ghostscript
libpng libtiff libxml2 libheif libde265 djvulibre liblqr1 libpng libtiff libxml2 libheif libde265 djvulibre
] ]
++ lib.optionals (!stdenv.hostPlatform.isMinGW) ++ lib.optionals (!stdenv.hostPlatform.isMinGW)
[ openexr librsvg openjpeg ] [ openexr librsvg openjpeg ]

5
pkgs/applications/graphics/ImageMagick/7.0.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, libtool { lib, stdenv, fetchFromGitHub, pkg-config, libtool
, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre
, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif , lcms2, openexr, libpng, liblqr1, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif
, ApplicationServices , ApplicationServices
, Foundation , Foundation
, testVersion, imagemagick , testVersion, imagemagick
@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
[ "--with-frozenpaths" ] [ "--with-frozenpaths" ]
++ (if arch != null then [ "--with-gcc-arch=${arch}" ] else [ "--without-gcc-arch" ]) ++ (if arch != null then [ "--with-gcc-arch=${arch}" ] else [ "--without-gcc-arch" ])
++ lib.optional (librsvg != null) "--with-rsvg" ++ lib.optional (librsvg != null) "--with-rsvg"
++ lib.optional (liblqr1 != null) "--with-lqr"
++ 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"
@ -48,7 +49,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ zlib fontconfig freetype ghostscript [ zlib fontconfig freetype ghostscript
libpng libtiff libxml2 libheif djvulibre liblqr1 libpng libtiff libxml2 libheif djvulibre
] ]
++ lib.optionals (!stdenv.hostPlatform.isMinGW) ++ lib.optionals (!stdenv.hostPlatform.isMinGW)
[ openexr librsvg openjpeg ] [ openexr librsvg openjpeg ]

2
pkgs/top-level/all-packages.nix
View File

@ -24695,6 +24695,7 @@ in
lcms2 = null; lcms2 = null;
openexr = null; openexr = null;
libpng = null; libpng = null;
liblqr1 = null;
librsvg = null; librsvg = null;
libtiff = null; libtiff = null;
libxml2 = null; libxml2 = null;
@ -24725,6 +24726,7 @@ in
lcms2 = null; lcms2 = null;
openexr = null; openexr = null;
libpng = null; libpng = null;
liblqr1 = null;
librsvg = null; librsvg = null;
libtiff = null; libtiff = null;
libxml2 = null; libxml2 = null;