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/applications/blockchains | |
| parent | 0bba7474b3e6c8cef36960614446447d38ec04c9 (diff) | |
| download | nixlib-066db11215a2287a88a80ec71595cd8764563444.tar nixlib-066db11215a2287a88a80ec71595cd8764563444.tar.gz nixlib-066db11215a2287a88a80ec71595cd8764563444.tar.bz2 nixlib-066db11215a2287a88a80ec71595cd8764563444.tar.lz nixlib-066db11215a2287a88a80ec71595cd8764563444.tar.xz nixlib-066db11215a2287a88a80ec71595cd8764563444.tar.zst nixlib-066db11215a2287a88a80ec71595cd8764563444.zip | |
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/applications/blockchains')
| -rw-r--r-- | pkgs/applications/blockchains/go-ethereum.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/blockchains/lnd.nix | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index 80e17cf1138a..d8660967a4e0 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -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 ]; diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd.nix index 4be19beedc39..dd45746c8df5 100644 --- a/pkgs/applications/blockchains/lnd.nix +++ b/pkgs/applications/blockchains/lnd.nix @@ -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 ]; }; } |