From 968d075bd978db46b9119324af270ffdd41292d4 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Thu, 30 Jan 2020 15:50:44 -0500 Subject: [PATCH] imlib2: Add webp support And better document why id3 is there In addition, review function signature formatting. --- pkgs/development/libraries/imlib2/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index ef535bbd86e8..36b1063531e4 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -1,6 +1,11 @@ -{ stdenv, fetchurl, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig -, freetype, libid3tag -, x11Support ? true, xlibsWrapper ? null }: +{ stdenv, fetchurl +# Image file formats +, libjpeg, libtiff, giflib, libpng, libwebp +# imlib2 can load images from ID3 tags. +, libid3tag +, freetype , bzip2, pkgconfig +, x11Support ? true, xlibsWrapper ? null +}: let inherit (stdenv.lib) optional; @@ -14,8 +19,10 @@ stdenv.mkDerivation rec { sha256 = "0v8n3dswx7rxqfd0q03xwc7j2w1mv8lv18rdxv487a1xw5vklfad"; }; - buildInputs = [ libjpeg libtiff giflib libpng bzip2 freetype libid3tag ] - ++ optional x11Support xlibsWrapper; + buildInputs = [ + libjpeg libtiff giflib libpng libwebp + bzip2 freetype libid3tag + ] ++ optional x11Support xlibsWrapper; nativeBuildInputs = [ pkgconfig ];