From e4bc623eb3e49bf8ba02d01bf102e8b0762de454 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Mar 2021 12:27:50 +0000 Subject: [PATCH 1/2] resvg: 0.13.1 -> 0.14.0 --- pkgs/tools/graphics/resvg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/tools/graphics/resvg/default.nix index 8c8164a7e8e..0fe47ff5256 100644 --- a/pkgs/tools/graphics/resvg/default.nix +++ b/pkgs/tools/graphics/resvg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "resvg"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Jo+dx4+3GpEwOoE8HH0YahBmPvT9Oy2qXMvCJ/NZhF0="; + sha256 = "sha256-fd97w6yd9ZX2k8Vq+Vh6jouufGdFE02ZV8mb+BtA3tk="; }; - cargoSha256 = "sha256-8Es9NZYsC/9PZ6ytWZTAH42U3vxZtJERPSsno1s4TEc="; + cargoSha256 = "sha256-LlEYfjUINQW/YrhNp/Z+fdLQPcvrTjNFtDAk1gyAuj0="; doCheck = false; From 751f46c0cdd03bcfff181e1918d3f3732dc4a403 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 13 Mar 2021 12:28:00 +0000 Subject: [PATCH 2/2] resvg: fix build on darwin --- pkgs/tools/graphics/resvg/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/tools/graphics/resvg/default.nix index 0fe47ff5256..e0968dd6271 100644 --- a/pkgs/tools/graphics/resvg/default.nix +++ b/pkgs/tools/graphics/resvg/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, libiconv }: rustPlatform.buildRustPackage rec { pname = "resvg"; @@ -13,11 +13,14 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-LlEYfjUINQW/YrhNp/Z+fdLQPcvrTjNFtDAk1gyAuj0="; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + doCheck = false; meta = with lib; { description = "An SVG rendering library"; homepage = "https://github.com/RazrFalcon/resvg"; + changelog = "https://github.com/RazrFalcon/resvg/raw/v${version}/CHANGELOG.md"; license = licenses.mpl20; maintainers = [ maintainers.marsam ]; };