Skip to content

Commit a4acd53

Browse files
Petar KirovPetarKirov
authored andcommitted
fix(solana-bpf-tools): Upgrade to 1.29 and make it compatible with latest nixpkgs
Where openssl is now 3.0.5, so we need to use `openssl_1_1`.
1 parent d6a0199 commit a4acd53

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

packages/solana-bpf-tools/default.nix

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,29 @@
22
with pkgs;
33
stdenv.mkDerivation rec {
44
name = "solana-bpf-tools-${version}";
5-
version = "1.23";
5+
version = "1.29";
66
src = fetchzip {
77
url = "https://github.com/solana-labs/bpf-tools/releases/download/v${version}/solana-bpf-tools-linux.tar.bz2";
8-
sha256 = "sha256-4aWBOAOcGviwJ7znGaHbB1ngNzdXqlfDX8gbZtdV1aA=";
8+
sha256 = "sha256-WxO7Jw2EJPP1u2U80MEosjrwPfOAFzvl0ovx3nADtMk=";
99
stripRoot = false;
1010
};
1111

1212
nativeBuildInputs = [autoPatchelfHook];
13+
1314
buildInputs = with pkgs; [
1415
zlib
15-
stdenv.cc.cc
16-
openssl
16+
openssl_1_1
1717
];
1818

1919
installPhase = ''
2020
mkdir -p $out/dependencies/bpf-tools;
2121
cp -r $src/llvm $out/dependencies/bpf-tools/;
22-
cp -r $src/rust $out/dependencies/bpf-tools/;
23-
chmod 0755 -R $out;
22+
23+
mkdir -p $TMP/rust
24+
cp -r $src/rust $TMP/rust;
25+
rm -rf $TMP/rust/lib/rustlib/src
26+
cp -r $TMP/rust $out/dependencies/bpf-tools/;
27+
2428
mkdir -p $out/bin/sdk/bpf/
2529
cp -r $out/dependencies $out/bin/sdk/bpf/
2630
'';

0 commit comments

Comments
 (0)