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

Merge pull request #123550 from stephank/fix-trunk-darwin 

trunk: fix darwin build
This commit is contained in:
Jörg Thalheim 2021-05-18 21:18:08 +01:00 committed by GitHub
parent ab205c5de1 5c3b09aecb
commit e21b618934
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/tools/trunk/default.nix
View File

@ -1,4 +1,5 @@
{ rustPlatform, fetchFromGitHub, pkg-config, openssl, lib }: { lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config
, openssl, libiconv, CoreServices, Security }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "trunk"; pname = "trunk";
@ -12,7 +13,9 @@ rustPlatform.buildRustPackage rec {
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]; buildInputs = if stdenv.isDarwin
then [ libiconv CoreServices Security ]
else [ openssl ];
cargoSha256 = "Qv7knTmNYtw0tbyWhFIV7tYkQiwFxcNPAeNiGCyeV8s="; cargoSha256 = "Qv7knTmNYtw0tbyWhFIV7tYkQiwFxcNPAeNiGCyeV8s=";

4
pkgs/top-level/all-packages.nix
View File

@ -9059,7 +9059,9 @@ in
trezor-suite = callPackage ../applications/blockchains/trezor-suite { }; 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 { }; tthsum = callPackage ../applications/misc/tthsum { };