From e1873ade382294a4e49acfe68ab811c119f12766 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sat, 9 Jan 2016 16:33:54 +0000 Subject: [PATCH 1/2] pngcrush: 1.7.85 -> 1.7.92 also fixes a compilation issue on OSX --- pkgs/tools/graphics/pngcrush/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index cc086da5a13..d4383e36349 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { - name = "pngcrush-1.7.85"; + name = "pngcrush-1.7.92"; src = fetchurl { url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz"; - sha256 = "1hvcync32x2ign694scafkj7xc73gzyy8n2l5z026yxckilyyv19"; + sha256 = "0dlwbqckv90cpvg8qhkl3nk5yb75ddi61vbpmmp9n0j6qq9lp6y4"; }; configurePhase = '' From 93ddfbacd4a25eab23eb5eba073638c6af7657d2 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sat, 9 Jan 2016 16:35:27 +0000 Subject: [PATCH 2/2] pngcrush: fixes compilation on darwin --- pkgs/tools/graphics/pngcrush/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index d4383e36349..6a6f3e7b13c 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0dlwbqckv90cpvg8qhkl3nk5yb75ddi61vbpmmp9n0j6qq9lp6y4"; }; + makeFlags = [ "CC=cc" "LD=cc" ]; # gcc and/or clang compat + configurePhase = '' sed -i s,/usr,$out, Makefile ''; @@ -18,7 +20,7 @@ stdenv.mkDerivation rec { homepage = http://pmt.sourceforge.net/pngcrush; description = "A PNG optimizer"; license = stdenv.lib.licenses.free; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; }