cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
pngtoico: use up-to-date libpng
This commit is contained in:
Rick van Schijndel 2023-12-14 23:29:43 +01:00 committed by GitHub
commit 64785a0a42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/tools/graphics/pngtoico/default.nix
View file

@ -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
'';

4
pkgs/top-level/all-packages.nix
View file

@ -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;