diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2020-03-27 07:33:21 +0000 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2020-03-27 07:33:21 +0000 |
| commit | 066db11215a2287a88a80ec71595cd8764563444 (patch) | |
| tree | 9b463617906764f1e824df6f56f7721d475f3a71 /pkgs/servers/caddy | |
| parent | 0bba7474b3e6c8cef36960614446447d38ec04c9 (diff) | |
Revert "Merge pull request #83099 from marsam/fix-buildGoModule-packages-darwin"
This reverts commit 4e6bf03504c9e09f067cc6dee6b5aeec43a1405c, reversing
changes made to afd997aab6e9b7a322198092c7828d6c560ac06f.
Instead we propagate those frameworks from the compiler again
Diffstat (limited to 'pkgs/servers/caddy')
| -rw-r--r-- | pkgs/servers/caddy/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/caddy/v2.nix | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 8b51e584e3ec..bcd4b7065b58 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "caddy"; @@ -16,8 +16,6 @@ buildGoModule rec { }; modSha256 = "1gc0xvsihr4zp7hkrdfrplvzkaphz1y4q53rgwn2jhd8s98l57an"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - preBuild = '' cat << EOF > caddy/main.go package main diff --git a/pkgs/servers/caddy/v2.nix b/pkgs/servers/caddy/v2.nix index 7330388a7859..c0b2134abded 100644 --- a/pkgs/servers/caddy/v2.nix +++ b/pkgs/servers/caddy/v2.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, callPackage, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "caddy"; @@ -16,8 +16,6 @@ buildGoModule rec { }; modSha256 = "1sb8w6n84cpya2rjm0zm798kzf5vjpkr5440j1gfnnnr07jl2aqn"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { homepage = "https://caddyserver.com"; description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS"; |