about summary refs log tree commit diff
path: root/pkgs/development/libraries/imlib2
diff options
context:
space:
mode:
authorDaniel Nagy <danielnagy@posteo.de>2022-08-24 23:32:48 +0200
committerGitHub <noreply@github.com>2022-08-24 23:32:48 +0200
commitabaa4b5e514b93011c23cc05b21c13c20fbb93f9 (patch)
tree56bea862e0df19d58538510d02bc823e66830e5b /pkgs/development/libraries/imlib2
parentf3d30b608a528b566b80af2ab7ea190427b97289 (diff)
Imlib2: Add JPEGXL and Postscript support, make webp support optional (#186492)
Co-authored-by: Robert Scott <code@humanleg.org.uk>
Diffstat (limited to 'pkgs/development/libraries/imlib2')
-rw-r--r--pkgs/development/libraries/imlib2/default.nix19
1 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix
index a5dc57c8ffd84..12d972390630c 100644
--- a/pkgs/development/libraries/imlib2/default.nix
+++ b/pkgs/development/libraries/imlib2/default.nix
@@ -1,14 +1,16 @@
 { lib, stdenv, fetchurl
 # Image file formats
-, libjpeg, libtiff, giflib, libpng, libwebp
+, libjpeg, libtiff, giflib, libpng, libwebp, libjxl
+, libspectre
 # imlib2 can load images from ID3 tags.
 , libid3tag, librsvg, libheif
 , freetype , bzip2, pkg-config
 , x11Support ? true, xlibsWrapper ? null
-# Compilation error on Darwin with librsvg. For more information see:
-# https://github.com/NixOS/nixpkgs/pull/166452#issuecomment-1090725613
-, svgSupport ? !stdenv.isDarwin
-, heifSupport ? !stdenv.isDarwin
+, svgSupport ? false
+, heifSupport ? false
+, webpSupport ? false
+, jxlSupport ? false
+, psSupport ? false
 
 # for passthru.tests
 , libcaca
@@ -33,11 +35,14 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libjpeg libtiff giflib libpng libwebp
+    libjpeg libtiff giflib libpng
     bzip2 freetype libid3tag
   ] ++ optional x11Support xlibsWrapper
     ++ optional heifSupport libheif
-    ++ optional svgSupport librsvg;
+    ++ optional svgSupport librsvg
+    ++ optional webpSupport libwebp
+    ++ optional jxlSupport libjxl
+    ++ optional psSupport libspectre;
 
   nativeBuildInputs = [ pkg-config ];