Unverified Commit 1c83a06c authored by Randy Eckenrode's avatar Randy Eckenrode
Browse files

solana-cli: get libc++ headers on Darwin from stdenv.cc.libcxx

parent 61cc6870

pkgs/by-name/so/solana-cli/package.nix

+2 −4
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
  darwin,

  udev,

  protobuf,

  libcxx,

  rocksdb_8_3,

  installShellFiles,

  pkg-config,
@@ -99,7 +98,6 @@ rustPlatform.buildRustPackage rec { 
    ]

    ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      libcxx

      IOKit

      Security

      AppKit
@@ -133,8 +131,8 @@ rustPlatform.buildRustPackage rec { 


  # Require this on darwin otherwise the compiler starts rambling about missing

  # cmath functions

  CPPFLAGS = lib.optionals stdenv.hostPlatform.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1";

  LDFLAGS = lib.optionals stdenv.hostPlatform.isDarwin "-L${lib.getLib libcxx}/lib";

  CPPFLAGS = lib.optionals stdenv.hostPlatform.isDarwin "-isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1";

  LDFLAGS = lib.optionals stdenv.hostPlatform.isDarwin "-L${lib.getLib stdenv.cc.libcxx}/lib";



  # If set, always finds OpenSSL in the system, even if the vendored feature is enabled.

  OPENSSL_NO_VENDOR = 1;