From 0ad5a24738e0f456a1f2c43e2381fe51f75fa0b8 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Mon, 15 May 2023 22:30:00 +0200 Subject: [PATCH] pngcheck: support cross compilation and install man page --- pkgs/tools/graphics/pngcheck/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix index cb415a2c53ef..a90881dad224 100644 --- a/pkgs/tools/graphics/pngcheck/default.nix +++ b/pkgs/tools/graphics/pngcheck/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, zlib, installShellFiles }: stdenv.mkDerivation rec { pname = "pngcheck"; @@ -11,22 +11,27 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile.unx --replace "gcc" "clang" + postPatch = '' + substituteInPlace $makefile \ + --replace "gcc" "$CC" ''; makefile = "Makefile.unx"; makeFlags = [ "ZPATH=${zlib.static}/lib" ]; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ zlib ]; installPhase = '' - mkdir -p $out/bin/ - cp pngcheck $out/bin/pngcheck + runHook preInstall + install -Dm555 -t $out/bin/ pngcheck + installManPage $pname.1 + runHook postInstall ''; meta = with lib; { - homepage = "http://pmt.sourceforge.net/pngcrush"; + homepage = "https://pmt.sourceforge.net/pngcrush"; description = "Verifies the integrity of PNG, JNG and MNG files"; license = licenses.free; platforms = platforms.unix;