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

Revert "Merge pull request #83099 from marsam/fix-buildGoModule-packages-darwin"

Browse Source 
This reverts commit 4e6bf03504, reversing
changes made to afd997aab6.

Instead we propagate those frameworks from the compiler again
This commit is contained in:
Jörg Thalheim
2020-03-27 07:33:21 +00:00
parent 0bba7474b3
commit 066db11215
133 changed files with 443 additions and 861 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/caddy/default.nix
+1 -3
View File
@@ -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
pkgs/servers/caddy/v2.nix
+1 -3
View File
@@ -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";