From d73b884cf13de36ff43403ba1345b5f3b26f3de5 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Mon, 22 Jun 2026 21:59:05 +0100 Subject: [PATCH] solana-cli: fix build for 4.0.3 --- pkgs/by-name/so/solana-cli/package.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/so/solana-cli/package.nix b/pkgs/by-name/so/solana-cli/package.nix index 210abdb785c8..7a76280783b9 100644 --- a/pkgs/by-name/so/solana-cli/package.nix +++ b/pkgs/by-name/so/solana-cli/package.nix @@ -3,6 +3,7 @@ fetchFromGitHub, lib, rustPlatform, + darwin, udev, protobuf, installShellFiles, @@ -12,20 +13,15 @@ versionCheckHook, clang, libclang, + libusb1, rocksdb, - # Taken from https://github.com/anza-xyz/agave/blob/master/scripts/cargo-install-all.sh#L84 + # Taken from https://github.com/anza-xyz/agave/blob/master/scripts/agave-build-lists.sh solanaPkgs ? [ - "cargo-build-sbf" - "cargo-test-sbf" "solana" - "solana-bench-tps" "solana-faucet" "solana-gossip" "agave-install" "solana-keygen" - "agave-ledger-tool" - "solana-dos" - "solana-net-shaper" "agave-validator" "solana-test-validator" "agave-watchtower" @@ -84,11 +80,14 @@ rustPlatform.buildRustPackage rec { installShellFiles protobuf pkg-config - ]; + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]; + buildInputs = [ openssl clang libclang + libusb1 rustPlatform.bindgenHook ] ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ];