From 5c3b09aecb8bec7237a6dbf1d46899f7445c681b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 18 May 2021 19:27:34 +0200 Subject: [PATCH] trunk: fix darwin build --- pkgs/development/tools/trunk/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/trunk/default.nix b/pkgs/development/tools/trunk/default.nix index d31c030edac7..9284e1df4547 100644 --- a/pkgs/development/tools/trunk/default.nix +++ b/pkgs/development/tools/trunk/default.nix @@ -1,4 +1,5 @@ -{ rustPlatform, fetchFromGitHub, pkg-config, openssl, lib }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config +, openssl, libiconv, CoreServices, Security }: rustPlatform.buildRustPackage rec { pname = "trunk"; @@ -12,7 +13,9 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = if stdenv.isDarwin + then [ libiconv CoreServices Security ] + else [ openssl ]; cargoSha256 = "Qv7knTmNYtw0tbyWhFIV7tYkQiwFxcNPAeNiGCyeV8s="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 966a6cbc41b8..a7f2e0edf81e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9059,7 +9059,9 @@ in trezor-suite = callPackage ../applications/blockchains/trezor-suite { }; - trunk = callPackage ../development/tools/trunk { }; + trunk = callPackage ../development/tools/trunk { + inherit (darwin.apple_sdk.frameworks) CoreServices Security; + }; tthsum = callPackage ../applications/misc/tthsum { };