Merge pull request #242721 from amarshall/temporal-cli-darwin-sandbox

temporal-cli: Fix Darwin builds with sandbox enabled
This commit is contained in:
Sandro 2023-07-23 23:00:42 +02:00 committed by GitHub
commit d3ec97458e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 2 deletions

View File

@ -0,0 +1,20 @@
--- vendor/modernc.org/libc/honnef.co/go/netdb/netdb.go
+++ vendor/modernc.org/libc/honnef.co/go/netdb/netdb.go
@@ -696,7 +696,7 @@ func init() {
// Load protocols
data, err := ioutil.ReadFile("/etc/protocols")
if err != nil {
- if !os.IsNotExist(err) {
+ if !os.IsNotExist(err) && !os.IsPermission(err) {
panic(err)
}
@@ -732,7 +732,7 @@ func init() {
// Load services
data, err = ioutil.ReadFile("/etc/services")
if err != nil {
- if !os.IsNotExist(err) {
+ if !os.IsNotExist(err) && !os.IsPermission(err) {
panic(err)
}

View File

@ -1,6 +1,13 @@
{ lib, fetchFromGitHub, buildGoModule, installShellFiles, symlinkJoin }:
let
overrideModAttrs = old: {
# https://gitlab.com/cznic/libc/-/merge_requests/10
postBuild = ''
patch -p0 < ${./darwin-sandbox-fix.patch}
'';
};
tctl-next = buildGoModule rec {
pname = "tctl-next";
version = "0.9.0";
@ -12,7 +19,9 @@ let
hash = "sha256-zgi1wNx7fWf/iFGKaVffcXnC90vUz+mBT6HhCGdXMa0=";
};
vendorHash = "sha256-muTNwK2Sb2+0df/6DtAzT14gwyuqa13jkG6eQaqhSKg=";
vendorHash = "sha256-EX1T3AygarJn4Zae2I8CHQrZakmbNF1OwE4YZFF+nKc=";
inherit overrideModAttrs;
nativeBuildInputs = [ installShellFiles ];
@ -33,6 +42,8 @@ let
--bash <($out/bin/temporal completion bash) \
--zsh <($out/bin/temporal completion zsh)
'';
__darwinAllowLocalNetworking = true;
};
tctl = buildGoModule rec {
@ -46,7 +57,9 @@ let
hash = "sha256-LcBKkx3mcDOrGT6yJx98CSgxbwskqGPWqOzHWOu6cig=";
};
vendorHash = "sha256-BUYEeC5zli++OxVFgECJGqJkbDwglLppSxgo+4AqOb0=";
vendorHash = "sha256-5wCIY95mJ6+FCln4yBu+fM4ZcsxBGcXkCvxjGzt0+dM=";
inherit overrideModAttrs;
nativeBuildInputs = [ installShellFiles ];
@ -63,6 +76,8 @@ let
--bash <($out/bin/tctl completion bash) \
--zsh <($out/bin/tctl completion zsh)
'';
__darwinAllowLocalNetworking = true;
};
in
symlinkJoin rec {
@ -75,6 +90,8 @@ symlinkJoin rec {
tctl
];
passthru = { inherit tctl tctl-next; };
meta = with lib; {
description = "Temporal CLI";
homepage = "https://temporal.io";