public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

caddy2: fix build on darwin

Browse Source
This commit is contained in:
Mario Rodas 2020-03-21 04:57:00 -05:00
parent e260f4861c
commit 5480f994e9
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/caddy/v2.nix
View File

@ -1,4 +1,4 @@
{ stdenv, callPackage, buildGoModule, fetchFromGitHub }: { stdenv, callPackage, buildGoModule, fetchFromGitHub, Security }:
buildGoModule rec { buildGoModule rec {
pname = "caddy"; pname = "caddy";
@ -16,6 +16,8 @@ buildGoModule rec {
}; };
modSha256 = "1sb8w6n84cpya2rjm0zm798kzf5vjpkr5440j1gfnnnr07jl2aqn"; modSha256 = "1sb8w6n84cpya2rjm0zm798kzf5vjpkr5440j1gfnnnr07jl2aqn";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://caddyserver.com"; homepage = "https://caddyserver.com";
description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS"; description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS";

4
pkgs/top-level/all-packages.nix
View File

@ -1403,7 +1403,9 @@ in
caddy = callPackage ../servers/caddy { caddy = callPackage ../servers/caddy {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
}; };
caddy2 = callPackage ../servers/caddy/v2.nix { }; caddy2 = callPackage ../servers/caddy/v2.nix {
inherit (darwin.apple_sdk.frameworks) Security;
};
traefik = callPackage ../servers/traefik { }; traefik = callPackage ../servers/traefik { };
calamares = libsForQt5.callPackage ../tools/misc/calamares { calamares = libsForQt5.callPackage ../tools/misc/calamares {