Merge pull request #115407 from prusnak/trezord-darwin

trezord: fix build on darwin
This commit is contained in:
Pavol Rusnak 2021-03-08 13:34:39 +01:00 committed by GitHub
commit 588e7caf63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions

View File

@ -1,7 +1,9 @@
{ lib { lib
, stdenv
, buildGoModule , buildGoModule
, fetchFromGitHub , fetchFromGitHub
, trezor-udev-rules , trezor-udev-rules
, AppKit
}: }:
buildGoModule rec { buildGoModule rec {
@ -17,7 +19,8 @@ buildGoModule rec {
vendorSha256 = "0wb959xzyvr5zzjvkfqc422frmf97q5nr460f02wwx0pj6ch0y61"; vendorSha256 = "0wb959xzyvr5zzjvkfqc422frmf97q5nr460f02wwx0pj6ch0y61";
propagatedBuildInputs = [ trezor-udev-rules ]; propagatedBuildInputs = lib.optionals stdenv.isLinux [ trezor-udev-rules ]
++ lib.optionals stdenv.isDarwin [ AppKit ];
meta = with lib; { meta = with lib; {
description = "Trezor Communication Daemon aka Trezor Bridge"; description = "Trezor Communication Daemon aka Trezor Bridge";

View File

@ -8560,7 +8560,9 @@ in
trezorctl = with python3Packages; toPythonApplication trezor; trezorctl = with python3Packages; toPythonApplication trezor;
trezord = callPackage ../servers/trezord { }; trezord = callPackage ../servers/trezord {
inherit (darwin.apple_sdk.frameworks) AppKit;
};
trezor_agent = with python3Packages; toPythonApplication trezor_agent; trezor_agent = with python3Packages; toPythonApplication trezor_agent;