diff --git a/pkgs/servers/caddy/xcaddy/default.nix b/pkgs/servers/caddy/xcaddy/default.nix index d064d7e5464f..634a6aed1402 100644 --- a/pkgs/servers/caddy/xcaddy/default.nix +++ b/pkgs/servers/caddy/xcaddy/default.nix @@ -13,6 +13,10 @@ buildGoModule rec { hash = "sha256-oGTtS5UlEebIqv4SM4q0YclASJNu8DNOLrGLRRAtkd8="; }; + patches = [ + ./use_tmpdir_on_darwin.diff + ]; + vendorHash = "sha256-RpbnoXyTrqGOI7DpgkO+J47P17T4QCVvM1CfS6kRO9Y="; meta = with lib; { diff --git a/pkgs/servers/caddy/xcaddy/use_tmpdir_on_darwin.diff b/pkgs/servers/caddy/xcaddy/use_tmpdir_on_darwin.diff new file mode 100644 index 000000000000..064d8feb5a05 --- /dev/null +++ b/pkgs/servers/caddy/xcaddy/use_tmpdir_on_darwin.diff @@ -0,0 +1,13 @@ +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