diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index a5dc57c8ffd8..12d972390630 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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99efe4fb379a..393acb1410a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18653,6 +18653,15 @@ with pkgs; iml = callPackage ../development/libraries/iml { }; imlib2 = callPackage ../development/libraries/imlib2 { }; + imlib2Full = imlib2.override { + # 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; + webpSupport = true; + jxlSupport = true; + psSupport = true; + }; imlib2-nox = imlib2.override { x11Support = false; };