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

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
@@ -1,4 +1,4 @@
{ stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit, CoreServices }:
{ stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit }:
buildGoModule rec {
pname = "go-ethereum";
@@ -30,8 +30,6 @@ buildGoModule rec {
"cmd/wnode"
];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
# Fix for usb-related segmentation faults on darwin
propagatedBuildInputs =
stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ];
+3 -5
View File
@@ -1,4 +1,4 @@
{ buildGoModule, fetchFromGitHub, stdenv, Security }:
{ buildGoModule, fetchFromGitHub, lib }:
buildGoModule rec {
pname = "lnd";
@@ -13,12 +13,10 @@ buildGoModule rec {
modSha256 = "1pvcvpiz6ck8xkgpypchrq9kgkik0jxd7f3jhihbgldsh4zaqiaq";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Lightning Network Daemon";
homepage = "https://github.com/lightningnetwork/lnd";
license = licenses.mit;
license = lib.licenses.mit;
maintainers = with maintainers; [ cypherpunk2140 ];
};
}