Merge pull request #269020 from LeSuisse/pngtoico-use-up-to-date-libpng

pngtoico: use up-to-date libpng

pkgs/tools/graphics/pngtoico/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, libpng }:
+{ lib, stdenv, fetchurl, libpng, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "pngtoico";
@@ -9,6 +9,13 @@ stdenv.mkDerivation rec {
     sha256 = "1xb4aa57sjvgqfp01br3dm72hf7q0gb2ad144s1ifrs09215fgph";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/pngtoico/files/pngtoico-1.0.1-libpng15.patch";
+      hash = "sha256-MeRV4FL37Wq7aFRnjbxPokcBKmPM+h94cnFJmdvHAt0=";
+    })
+  ];
+
   configurePhase = ''
     sed -i s,/usr/local,$out, Makefile
   '';

pkgs/top-level/all-packages.nix

@@ -12199,9 +12199,7 @@ with pkgs;
 
   pngoptimizer = callPackage ../tools/graphics/pngoptimizer { };
 
-  pngtoico = callPackage ../tools/graphics/pngtoico {
-    libpng = libpng12;
-  };
+  pngtoico = callPackage ../tools/graphics/pngtoico { };
 
   pngpaste = callPackage ../os-specific/darwin/pngpaste {
     inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;