Merge pull request #275119 from marsam/trunk-fix-darwin

trunk: fix build on darwin
This commit is contained in:
Nick Cao 2023-12-18 10:24:54 -05:00 committed by GitHub
commit 08a9c19a6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions

View File

@ -4,11 +4,10 @@ rustPlatform,
fetchFromGitHub,
pkg-config,
openssl,
libiconv,
jq,
moreutils,
CoreServices,
Security
SystemConfiguration
}:
rustPlatform.buildRustPackage rec {
@ -24,7 +23,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = if stdenv.isDarwin
then [ libiconv CoreServices Security ]
then [ CoreServices SystemConfiguration ]
else [ openssl ];
# requires network
checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ];

View File

@ -14068,7 +14068,7 @@ with pkgs;
trezor-suite = callPackage ../applications/blockchains/trezor-suite { };
trunk = callPackage ../development/tools/trunk {
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration;
};
trunk-io = callPackage ../development/tools/trunk-io { };