Unverified Commit 4a528c3e authored by Yt's avatar Yt Committed by GitHub
Browse files

Merge pull request #303306 from xrelkd/update/solana-cli

solana-cli: install shell completions
parents 8847bb91 dc11297a
Loading
Loading
Loading
Loading
+22 −15
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@
, protobuf
, libcxx
, rocksdb
, installShellFiles
, pkg-config
, openssl
, nix-update-script
@@ -66,7 +67,7 @@ rustPlatform.buildRustPackage rec {
  # I'm not in the mood ((ΦωΦ))
  doCheck = false;

  nativeBuildInputs = [ protobuf pkg-config ];
  nativeBuildInputs = [ installShellFiles protobuf pkg-config ];
  buildInputs = [ openssl rustPlatform.bindgenHook ]
    ++ lib.optionals stdenv.isLinux [ udev ]
    ++ lib.optionals stdenv.isDarwin [
@@ -75,9 +76,15 @@ rustPlatform.buildRustPackage rec {
    Security
    AppKit
    System
                  Libsystem ];
    Libsystem
  ];

  postInstall = ''
    installShellCompletion --cmd solana \
      --bash <($out/bin/solana completion --shell bash) \
      --fish <($out/bin/solana completion --shell fish) \
      --zsh  <($out/bin/solana completion --shell zsh)

    mkdir -p $out/bin/sdk/bpf
    cp -a ./sdk/bpf/* $out/bin/sdk/bpf/
  '';
@@ -95,7 +102,7 @@ rustPlatform.buildRustPackage rec {
  OPENSSL_NO_VENDOR = 1;

  meta = with lib; {
    description = "Web-Scale Blockchain for fast, secure, scalable, decentralized apps and marketplaces. ";
    description = "Web-Scale Blockchain for fast, secure, scalable, decentralized apps and marketplaces";
    homepage = "https://solana.com";
    license = licenses.asl20;
    maintainers = with maintainers; [ netfox happysalada aikooo7 ];
+0 −2
Original line number Diff line number Diff line
@@ -36454,8 +36454,6 @@ with pkgs;
  sumokoin = callPackage ../applications/blockchains/sumokoin { };
  solana-cli = callPackage ../applications/blockchains/solana { };
  solana-validator = callPackage ../applications/blockchains/solana-validator { };
  snarkos = callPackage ../applications/blockchains/snarkos {