Unverified Commit fb3adb15 authored by Emily's avatar Emily Committed by GitHub
Browse files

tree-wide: use `stdenv.cc.libcxx` instead of `libcxx` on Darwin (#399882)

parents 2f36571c 1c83a06c

pkgs/applications/science/math/R/default.nix

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

  Foundation,

  libobjc,

  libcxx,

  tzdata,

  withRecommendedPackages ? true,

  enableStrictBarrier ? false,
@@ -120,7 +119,6 @@ stdenv.mkDerivation (finalAttrs: { 
      Cocoa

      Foundation

      libobjc

      libcxx

    ];

  strictDeps = true;
@@ -173,8 +171,8 @@ stdenv.mkDerivation (finalAttrs: { 
      --disable-R-framework

      --without-x

      OBJC="clang"

      CPPFLAGS="-isystem ${lib.getDev libcxx}/include/c++/v1"

      LDFLAGS="-L${lib.getLib libcxx}/lib"

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

      LDFLAGS="-L${lib.getLib stdenv.cc.libcxx}/lib"

    ''

    + ''

      )

pkgs/by-name/fh/fh/package.nix

+1 −2
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
  stdenv,

  darwin,

  gcc,

  libcxx,

  cacert,

}:
@@ -38,7 +37,7 @@ rustPlatform.buildRustPackage rec { 
  ];



  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {

    NIX_CFLAGS_COMPILE = "-I${lib.getDev libcxx}/include/c++/v1";

    NIX_CFLAGS_COMPILE = "-I${lib.getInclude stdenv.cc.libcxx}/include/c++/v1";

  };



  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

pkgs/by-name/mo/moltenvk/package.nix

+1 −2
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
  gitUpdater,

  apple-sdk_15,

  cereal,

  libcxx,

  glslang,

  spirv-cross,

  spirv-headers,
@@ -103,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { 


  env.NIX_CFLAGS_COMPILE = toString (

    [

      "-isystem ${lib.getDev libcxx}/include/c++/v1"

      "-isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"

      "-I${lib.getDev spirv-cross}/include/spirv_cross"

      "-I${lib.getDev spirv-headers}/include/spirv/unified1"

pkgs/by-name/se/servo/package.nix

+1 −3
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
  freetype,

  gst_all_1,

  harfbuzz,

  libcxx,

  libGL,

  libunwind,

  libxkbcommon,
@@ -131,10 +130,9 @@ rustPlatform.buildRustPackage { 
    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      apple-sdk_14

      libcxx

    ];



  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";

  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getInclude stdenv.cc.libcxx}/include/c++/v1";



  # copy resources into `$out` to be used during runtime

  # link runtime libraries

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;