cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

trunk: fix build on darwin

Browse source
This commit is contained in:
Mario Rodas 2023-12-17 20:40:00 -05:00
parent ca16221251
commit fa80274f38
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/tools/trunk/default.nix
View file

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

2
pkgs/top-level/all-packages.nix
View file

@ -14068,7 +14068,7 @@ with pkgs;
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; inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration;
}; };
trunk-io = callPackage ../development/tools/trunk-io { }; trunk-io = callPackage ../development/tools/trunk-io { };