scion-apps: fix build with Darwin sandbox
This commit is contained in:
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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 \
|
||||
|
||||
Reference in New Issue
Block a user