mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-14 01:33:10 +00:00
7a23457bac
Upstream xcaddy uses the $HOME directory as the temp directory on Darwin in order to fix an interesting bug. In order to find version information for Caddy, it runs a command that needs to operate on file system without "noexec" set, but Darwin's temp directory has it set. We can tolerate losing version information, since the alternative is that xcaddy does not run on Darwin.
14 lines
580 B
Diff
14 lines
580 B
Diff
diff --git a/builder.go b/builder.go
|
|
index ed6c5ef..36e8055 100644
|
|
--- a/builder.go
|
|
+++ b/builder.go
|
|
@@ -200,7 +200,7 @@ func NewReplace(old, new string) Replace {
|
|
// It is the caller's responsibility to remove the folder when finished.
|
|
func newTempFolder() (string, error) {
|
|
var parentDir string
|
|
- if runtime.GOOS == "darwin" {
|
|
+ if false && runtime.GOOS == "darwin" {
|
|
// After upgrading to macOS High Sierra, Caddy builds mysteriously
|
|
// started missing the embedded version information that -ldflags
|
|
// was supposed to produce. But it only happened on macOS after
|