diff options
| author | Theodore Ni <3806110+tjni@users.noreply.github.com> | 2022-08-07 20:03:02 -0700 |
|---|---|---|
| committer | Theodore Ni <3806110+tjni@users.noreply.github.com> | 2022-08-08 20:20:04 -0700 |
| commit | ddc57cfc0c2bfc0e5bb47dd6a7697c534080f213 (patch) | |
| tree | 7cb50b769066e78f84d13583290604ec414fd7cf | |
| parent | Merge pull request #185614 from AndersonTorres/bmake (diff) | |
| download | nixpkgs-ddc57cfc0c2bfc0e5bb47dd6a7697c534080f213.tar.gz | |
_3mux: fix build on Darwin
Pull in patch that updates golang.org/x/sys.
| -rw-r--r-- | pkgs/tools/misc/3mux/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/tools/misc/3mux/default.nix b/pkgs/tools/misc/3mux/default.nix index 4b5db58c6401..d91a52ddd3e9 100644 --- a/pkgs/tools/misc/3mux/default.nix +++ b/pkgs/tools/misc/3mux/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, makeWrapper }: buildGoModule rec { pname = "3mux"; @@ -11,9 +11,18 @@ buildGoModule rec { sha256 = "sha256-QT4QXTlJf2NfTqXE4GF759EoW6Ri12lxDyodyEFc+ag="; }; + patches = [ + # Fix the build for Darwin when building with Go 1.18. + (fetchpatch { + name = "darwin-go-1.18-fix.patch"; + url = "https://github.com/aaronjanse/3mux/pull/127/commits/91aed826c50f75a5175b63c72a1fb6a4ad57a008.patch"; + sha256 = "sha256-MOPAyWAYYWrlCCgw1rBaNmHZO9oTIpIQwLJcs0aY/m8="; + }) + ]; + nativeBuildInputs = [ makeWrapper ]; - vendorSha256 = "sha256-tbziQZIA1+b+ZtvA/865c8YQxn+r8HQy6Pqaac2kwcU="; + vendorSha256 = "sha256-qt8MYnvbZMuU1VwdSij6+x4N0r10c1R5Gcm+jDt76uc="; # This is a package used for internally testing 3mux. It's meant for # use by 3mux maintainers/contributors only. |