Merge pull request #250447 from aaronjheng/wrap

wrap: fix build
This commit is contained in:
Jonas Heinrich 2023-08-22 22:05:09 +02:00 committed by GitHub
commit b85ed9dcbf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -8,18 +8,23 @@ buildGoModule rec {
owner = "Wraparound"; owner = "Wraparound";
repo = "wrap"; repo = "wrap";
rev = "v${version}"; rev = "v${version}";
sha256 = "0scf7v83p40r9k7k5v41rwiy9yyanfv3jm6jxs9bspxpywgjrk77"; hash = "sha256-58wsH/e3X72S7tJUObazyvvkI8+B7DLPTBmQO9A+jmk=";
}; };
nativeBuildInputs = [ makeWrapper ]; vendorHash = "sha256-vg61Vypd+mSF9FyLFVpnS5UCTJDoobkDE1Cneg8O0RM=";
vendorSha256 = null; #vendorSha256 = ""; nativeBuildInputs = [ makeWrapper ];
patches = [ patches = [
(fetchpatch { (fetchpatch {
name = "courier-prime-variants.patch"; name = "courier-prime-variants.patch";
url = "https://github.com/Wraparound/wrap/commit/b72c280b6eddba9ec7b3507c1f143eb28a85c9c1.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"; homepage = "https://github.com/Wraparound/wrap";
license = licenses.gpl3Only; license = licenses.gpl3Only;
maintainers = [ maintainers.austinbutler ]; maintainers = [ maintainers.austinbutler ];
broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.goModules --check
}; };
} }