diff options
author | Justin Restivo <justin@restivo.me> | 2021-06-24 21:11:41 -0400 |
---|---|---|
committer | Justin Restivo <justin@restivo.me> | 2021-06-24 21:11:41 -0400 |
commit | 77c3d60b89aa60cd139aefe3a810395c9b7d45e5 (patch) | |
tree | 14d98009c66848a89e01afef353fc543c1b8fd9e | |
parent | 3b392e8951cef55c2c56e8549107ccd0f1920f0d (diff) | |
download | nixpkgs-77c3d60b89aa60cd139aefe3a810395c9b7d45e5.tar nixpkgs-77c3d60b89aa60cd139aefe3a810395c9b7d45e5.tar.gz nixpkgs-77c3d60b89aa60cd139aefe3a810395c9b7d45e5.tar.bz2 nixpkgs-77c3d60b89aa60cd139aefe3a810395c9b7d45e5.tar.lz nixpkgs-77c3d60b89aa60cd139aefe3a810395c9b7d45e5.tar.xz nixpkgs-77c3d60b89aa60cd139aefe3a810395c9b7d45e5.tar.zst nixpkgs-77c3d60b89aa60cd139aefe3a810395c9b7d45e5.zip |
imagemagick: add liquid rescale build option
-rw-r--r-- | pkgs/applications/graphics/ImageMagick/6.x.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/graphics/ImageMagick/7.0.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index bab1d6cfab7..3432e130717 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, libtool , 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 }: @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { [ "--with-frozenpaths" ] ++ (if arch != null then [ "--with-gcc-arch=${arch}" ] else [ "--without-gcc-arch" ]) ++ lib.optional (librsvg != null) "--with-rsvg" + ++ lib.optional (liblqr1 != null) "--with-lqr" ++ lib.optionals (ghostscript != null) [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" "--with-gslib" @@ -46,7 +47,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib fontconfig freetype ghostscript - libpng libtiff libxml2 libheif libde265 djvulibre + liblqr1 libpng libtiff libxml2 libheif libde265 djvulibre ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ openexr librsvg openjpeg ] diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index d7840a78bb4..369c1eba2ba 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, libtool , 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 , Foundation , testVersion, imagemagick @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { [ "--with-frozenpaths" ] ++ (if arch != null then [ "--with-gcc-arch=${arch}" ] else [ "--without-gcc-arch" ]) ++ lib.optional (librsvg != null) "--with-rsvg" + ++ lib.optional (liblqr1 != null) "--with-lqr" ++ lib.optionals (ghostscript != null) [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" "--with-gslib" @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib fontconfig freetype ghostscript - libpng libtiff libxml2 libheif djvulibre + liblqr1 libpng libtiff libxml2 libheif djvulibre ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ openexr librsvg openjpeg ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a005df9e60b..007fa3534d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24690,6 +24690,7 @@ in lcms2 = null; openexr = null; libpng = null; + liblqr1 = null; librsvg = null; libtiff = null; libxml2 = null; @@ -24720,6 +24721,7 @@ in lcms2 = null; openexr = null; libpng = null; + liblqr1 = null; librsvg = null; libtiff = null; libxml2 = null; |