about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSamuel Dionne-Riel <samuel@dionne-riel.com>2020-01-30 15:50:44 -0500
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2020-02-05 10:46:34 +0100
commit968d075bd978db46b9119324af270ffdd41292d4 (patch)
tree590f01e41459c65bd4f602be0b7e162898731342
parentb0f9922f3734dfaf52de13dacd3cfcb4bdd4ad0d (diff)
downloadnixlib-968d075bd978db46b9119324af270ffdd41292d4.tar
nixlib-968d075bd978db46b9119324af270ffdd41292d4.tar.gz
nixlib-968d075bd978db46b9119324af270ffdd41292d4.tar.bz2
nixlib-968d075bd978db46b9119324af270ffdd41292d4.tar.lz
nixlib-968d075bd978db46b9119324af270ffdd41292d4.tar.xz
nixlib-968d075bd978db46b9119324af270ffdd41292d4.tar.zst
nixlib-968d075bd978db46b9119324af270ffdd41292d4.zip
imlib2: Add webp support
And better document why id3 is there

In addition, review function signature formatting.
-rw-r--r--pkgs/development/libraries/imlib2/default.nix17
1 files 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 ];