tree-wide: use stdenv.cc.libcxx instead of libcxx on Darwin

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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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;

pkgs/development/ocaml-modules/eigen/default.nix

@@ -4,7 +4,6 @@
   buildDunePackage,
   fetchFromGitHub,
   ctypes,
-  libcxx,
 }:
 
 buildDunePackage rec {
@@ -22,7 +21,7 @@ buildDunePackage rec {
 
   minimalOCamlVersion = "4.02";
 
-  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";
 
   propagatedBuildInputs = [ ctypes ];
 

pkgs/development/python-modules/datatable/default.nix

@@ -6,7 +6,6 @@
   pipInstallHook,
   blessed,
   docutils,
-  libcxx,
   llvm,
   pytestCheckHook,
   typesentry,
@@ -53,7 +52,7 @@ buildPythonPackage rec {
   ];
 
   LLVM = llvm;
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1";
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1";
 
   # test suite is very cpu intensive, only run small subset to ensure package is working as expected
   pytestFlagsArray = [ "tests/test-sets.py" ];

pkgs/development/python-modules/kivy/default.nix

@@ -13,7 +13,6 @@
   SDL2_image,
   SDL2_ttf,
   SDL2_mixer,
-  libcxx,
   withGstreamer ? true,
   gst_all_1,
   pygments,
@@ -82,7 +81,7 @@ buildPythonPackage rec {
       "-Wno-error=incompatible-pointer-types"
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      "-I${lib.getDev libcxx}/include/c++/v1"
+      "-I${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"
     ]
   );
 

pkgs/development/python-modules/kiwisolver/default.nix

@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchPypi,
   stdenv,
-  libcxx,
   cppy,
   setuptools-scm,
   pythonOlder,
@@ -21,7 +20,7 @@ buildPythonPackage rec {
     hash = "sha256-I9XwI73Ix+VOtl8Dyl1bsltgHqxNfxoEKIih9FI3mH4=";
   };
 
-  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";
 
   nativeBuildInputs = [ setuptools-scm ];
 

pkgs/development/python-modules/numba/default.nix

@@ -10,7 +10,6 @@
   numpy,
   numpy_1,
   llvmlite,
-  libcxx,
   replaceVars,
   writers,
   numba,
@@ -74,7 +73,7 @@ buildPythonPackage rec {
         'numpy_version >= (3, 0)'
   '';
 
-  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";
 
   build-system = [
     setuptools

pkgs/development/python-modules/py3exiv2/default.nix

@@ -5,7 +5,6 @@
   buildPythonPackage,
   exiv2,
   fetchPypi,
-  libcxx,
   pythonOlder,
 }:
 
@@ -27,7 +26,7 @@ buildPythonPackage rec {
   ];
 
   # Work around Python distutils compiling C++ with $CC (see issue #26709)
-  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";
 
   pythonImportsCheck = [ "pyexiv2" ];
 

pkgs/development/r-modules/generic-builder.nix

@@ -2,7 +2,6 @@
   stdenv,
   lib,
   R,
-  libcxx,
   xvfb-run,
   util-linux,
   Cocoa,
@@ -38,7 +37,7 @@ stdenv.mkDerivation (
         libiconv
       ];
 
-    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";
 
     enableParallelBuilding = true;
 

pkgs/development/tools/build-managers/bazel/bazel_5/default.nix

@@ -28,7 +28,6 @@
   writeScript,
   # Apple dependencies
   cctools,
-  libcxx,
   sigtool,
   # Allow to independently override the jdks used to build and run respectively
   buildJdk,
@@ -451,7 +450,7 @@ stdenv.mkDerivation rec {
 
         # libcxx includes aren't added by libcxx hook
         # https://github.com/NixOS/nixpkgs/pull/41589
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libcxx}/include/c++/v1"
+        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"
         # for CLang 16 compatibility in external/{absl,upb} dependencies and in execlog
         export NIX_CFLAGS_COMPILE+=" -Wno-deprecated-builtins -Wno-gnu-offsetof-extensions -Wno-implicit-function-declaration"
 
@@ -622,7 +621,6 @@ stdenv.mkDerivation rec {
     ]
     ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
       cctools
-      libcxx
     ];
 
   # Bazel makes extensive use of symlinks in the WORKSPACE.

pkgs/development/tools/build-managers/bazel/bazel_6/default.nix

@@ -31,7 +31,6 @@
   writeScript,
   # Apple dependencies
   cctools,
-  libcxx,
   sigtool,
   # Allow to independently override the jdks used to build and run respectively
   buildJdk,
@@ -521,7 +520,7 @@ stdenv.mkDerivation rec {
 
         # libcxx includes aren't added by libcxx hook
         # https://github.com/NixOS/nixpkgs/pull/41589
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libcxx}/include/c++/v1"
+        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"
         # for CLang 16 compatibility in external/{absl,upb} dependencies
         export NIX_CFLAGS_COMPILE+=" -Wno-deprecated-builtins -Wno-gnu-offsetof-extensions"
 
@@ -690,7 +689,6 @@ stdenv.mkDerivation rec {
     ]
     ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
       cctools
-      libcxx
       sigtool
     ];
 

pkgs/development/tools/build-managers/bazel/bazel_7/default.nix

@@ -34,7 +34,6 @@
   python3,
   # Apple dependencies
   cctools,
-  libcxx,
   libtool,
   sigtool,
   # Allow to independently override the jdks used to build and run respectively
@@ -406,7 +405,7 @@ stdenv.mkDerivation rec {
 
         # libcxx includes aren't added by libcxx hook
         # https://github.com/NixOS/nixpkgs/pull/41589
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libcxx}/include/c++/v1"
+        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"
         # for CLang 16 compatibility in external/upb dependency
         export NIX_CFLAGS_COMPILE+=" -Wno-gnu-offsetof-extensions"
 
@@ -554,7 +553,6 @@ stdenv.mkDerivation rec {
     ]
     ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
       cctools
-      libcxx
     ];
 
   # Bazel makes extensive use of symlinks in the WORKSPACE.