From fa80274f38d473ba34aeefb696e4da34df765f79 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 17 Dec 2023 20:40:00 -0500 Subject: [PATCH] trunk: fix build on darwin --- pkgs/development/tools/trunk/default.nix | 5 ++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/trunk/default.nix b/pkgs/development/tools/trunk/default.nix index c19936b2bf64..b5a1c90926fb 100644 --- a/pkgs/development/tools/trunk/default.nix +++ b/pkgs/development/tools/trunk/default.nix @@ -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" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e27b5c511b9b..6185cbedd221 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };