From 25c4a8c092749bef04610e68708dc4e9af823660 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 21 Aug 2023 09:19:05 +0800 Subject: [PATCH] wrap: fix build --- pkgs/tools/text/wrap/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/text/wrap/default.nix b/pkgs/tools/text/wrap/default.nix index 728cad2c3fee..4eebcf60437b 100644 --- a/pkgs/tools/text/wrap/default.nix +++ b/pkgs/tools/text/wrap/default.nix @@ -8,18 +8,23 @@ buildGoModule rec { owner = "Wraparound"; repo = "wrap"; rev = "v${version}"; - sha256 = "0scf7v83p40r9k7k5v41rwiy9yyanfv3jm6jxs9bspxpywgjrk77"; + hash = "sha256-58wsH/e3X72S7tJUObazyvvkI8+B7DLPTBmQO9A+jmk="; }; - nativeBuildInputs = [ makeWrapper ]; + vendorHash = "sha256-vg61Vypd+mSF9FyLFVpnS5UCTJDoobkDE1Cneg8O0RM="; - vendorSha256 = null; #vendorSha256 = ""; + nativeBuildInputs = [ makeWrapper ]; patches = [ (fetchpatch { name = "courier-prime-variants.patch"; url = "https://github.com/Wraparound/wrap/commit/b72c280b6eddba9ec7b3507c1f143eb28a85c9c1.patch"; - sha256 = "1d9v0agfd7mgd17k4a8l6vr2kyswyfsyq3933dz56pgs5d3jric5"; + hash = "sha256-hcUsRyv6XVN+GyMN7LXzXPsp8jYUKTJPaK+e5p4CO7U="; + }) + # Fix build on Go 1.17+ + (fetchpatch { + url = "https://github.com/Wraparound/wrap/commit/a222c18a7e0810486741684781ff6158a359a8ba.patch"; + hash = "sha256-eIKvA91olfbNJhOhIUu3GOL/rbgX3m6unmU8nRdKbtc="; }) ]; @@ -32,6 +37,5 @@ buildGoModule rec { homepage = "https://github.com/Wraparound/wrap"; license = licenses.gpl3Only; maintainers = [ maintainers.austinbutler ]; - broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check }; }