From 507dc6bae6d1893f7c07782e86c6f3814ca15674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 10 Apr 2022 22:25:03 +0200 Subject: [PATCH] pngcheck: fix meta.platforms not being flattened, remove zlib overwrite zlib is build with static by default --- pkgs/tools/graphics/pngcheck/default.nix | 2 +- pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix index a4680dff6f64..cb415a2c53ef 100644 --- a/pkgs/tools/graphics/pngcheck/default.nix +++ b/pkgs/tools/graphics/pngcheck/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = "http://pmt.sourceforge.net/pngcrush"; description = "Verifies the integrity of PNG, JNG and MNG files"; license = licenses.free; - platforms = with platforms; [ unix ]; + platforms = platforms.unix; maintainers = with maintainers; [ starcraft66 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 010848c81c37..e932da6790ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9060,11 +9060,7 @@ with pkgs; pm2 = nodePackages.pm2; - pngcheck = callPackage ../tools/graphics/pngcheck { - zlib = zlib.override { - static = true; - }; - }; + pngcheck = callPackage ../tools/graphics/pngcheck { }; pngcrush = callPackage ../tools/graphics/pngcrush { };