git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #123550 from stephank/fix-trunk-darwin

trunk: fix darwin build

commite21b6189341c7d7ddbc7ee66097188e20976555e authorJörg Thalheim <Mic92@users.noreply.github.com> dateTue 18 May 2021, 21:18 (6 years ago) parentab205c55c3b09a
2 files changed+8−3
pkgs/development/tools/trunk/default.nix+5−2 pkgs/top-level/all-packages.nix+3−1
pkgs/development/tools/trunk/default.nix+5−2
@@ -1,4 +1,5 @@
1−{ rustPlatform, fetchFromGitHub, pkg-config, openssl, lib }:
1+{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config
2+, openssl, libiconv, CoreServices, Security }:
23
34rustPlatform.buildRustPackage rec {
45 pname = "trunk";
@@ -12,7 +13,9 @@ rustPlatform.buildRustPackage rec {
1213 };
1314
1415 nativeBuildInputs = [ pkg-config ];
15− buildInputs = [ openssl ];
16+ buildInputs = if stdenv.isDarwin
17+ then [ libiconv CoreServices Security ]
18+ else [ openssl ];
1619
1720 cargoSha256 = "Qv7knTmNYtw0tbyWhFIV7tYkQiwFxcNPAeNiGCyeV8s=";
1821
pkgs/top-level/all-packages.nix+3−1
@@ -9059,7 +9059,9 @@ in
90599059
90609060 trezor-suite = callPackage ../applications/blockchains/trezor-suite { };
90619061
9062− trunk = callPackage ../development/tools/trunk { };
9062+ trunk = callPackage ../development/tools/trunk {
9063+ inherit (darwin.apple_sdk.frameworks) CoreServices Security;
9064+ };
90639065
90649066 tthsum = callPackage ../applications/misc/tthsum { };
90659067