Merge branch 'master' into closure-size

Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.

1 files changed, 13 insertions, 11 deletions

diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix
index 77cc898ef2adc..985b8a1c59d51 100644
--- a/pkgs/tools/graphics/pngquant/default.nix
+++ b/pkgs/tools/graphics/pngquant/default.nix
@@ -1,16 +1,19 @@
-{ stdenv, fetchgit, libpng }:
+{ stdenv, fetchFromGitHub, pkgconfig, libpng, zlib, lcms2 }:
 
 stdenv.mkDerivation rec {
   name = "pngquant-${version}";
-  version = "2.0.1";
+  version = "2.6.0";
 
-  src = fetchgit {
-    url = https://github.com/pornel/pngquant.git;
-    rev = "refs/tags/${version}";
-    sha256 = "00mrv9wgxbwy517l8i4n7n3jpzirjdgi0zass3wj29i7xyipwlhf";
+  src = fetchFromGitHub {
+    owner = "pornel";
+    repo = "pngquant";
+    rev = version;
+    sha256 = "0sdh9cz330rhj6xvqk3sdhy0393qwyl349klk9r55g88rjp774s5";
   };
 
-  buildInputs = [ libpng ];
+  preConfigure = "patchShebangs .";
+
+  buildInputs = [ pkgconfig libpng zlib lcms2 ];
 
   preInstall = ''
     mkdir -p $out/bin
@@ -18,10 +21,9 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/pornel/pngquant;
-    description = "pngquant converts 24/32-bit RGBA PNGs to 8-bit palette with alpha channel preserved";
-    platforms = platforms.all;
+    homepage = https://pngquant.org/;
+    description = "A tool to convert 24/32-bit RGBA PNGs to 8-bit palette with alpha channel preserved";
+    platforms = platforms.linux;
     license = licenses.bsd2; # Not exactly bsd2, but alike
-    broken = true;
   };
 }