From 8888b8ca71aa8f47392bc5d2e4b5ed0ed0eaae58 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Fri, 29 May 2026 20:58:13 -0400 Subject: [PATCH] scion-apps: fix build with Darwin sandbox --- .../sc/scion-apps/darwin-sandbox-fix.patch | 20 +++++++++++++++++++ pkgs/by-name/sc/scion-apps/package.nix | 9 ++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/sc/scion-apps/darwin-sandbox-fix.patch diff --git a/pkgs/by-name/sc/scion-apps/darwin-sandbox-fix.patch b/pkgs/by-name/sc/scion-apps/darwin-sandbox-fix.patch new file mode 100644 index 000000000000..b390d492467c --- /dev/null +++ b/pkgs/by-name/sc/scion-apps/darwin-sandbox-fix.patch @@ -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) + } + diff --git a/pkgs/by-name/sc/scion-apps/package.nix b/pkgs/by-name/sc/scion-apps/package.nix index b3a48aac2684..8882ef16a1c0 100644 --- a/pkgs/by-name/sc/scion-apps/package.nix +++ b/pkgs/by-name/sc/scion-apps/package.nix @@ -16,7 +16,14 @@ buildGoModule { hash = "sha256-Tj0vtdYDmKbMpcO+t9KrtFewqdjusr0JRXpX6gY69WM="; }; - vendorHash = "sha256-om6ArtnKC9Gm5BdAqW57BnE0BsOmSPAAIPDDrQ5ZmJA="; + vendorHash = "sha256-/gBtKgCDyoCnJLfH5WgTCdOvoYRpPn8x2OHW0uYQnGQ="; + + overrideModAttrs = old: { + # https://gitlab.com/cznic/libc/-/merge_requests/10 + postBuild = '' + patch -p0 < ${./darwin-sandbox-fix.patch} + ''; + }; postPatch = '' substituteInPlace webapp/web/tests/health/scmpcheck.sh \