treewide: clean up remnants of overrideLibcxx

NixOS · Jan 3, 2025 · dde52ed · dde52ed
1 parent 3369d54
commit dde52ed
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
@@ -6,7 +6,6 @@
   llvmPackages,
   llvmPackages_15,
   overrideCC,
-  overrideLibcxx,
 }:
 
 let
@@ -36,15 +35,7 @@ let
     # Overrides that create a useful environment for swift packages, allowing
     # packaging with `swiftPackages.callPackage`.
     inherit (clang) bintools;
-    stdenv =
-      let
-        stdenv' = overrideCC pkgs.stdenv clang;
-      in
-      # Ensure that Swift’s internal clang uses the same libc++ and libc++abi as the
-      # default clang’s stdenv. Using the default libc++ avoids issues (such as crashes)
-      # that can happen when a Swift application dynamically links different versions
-      # of libc++ and libc++abi than libraries it links are using.
-      if stdenv'.cc.libcxx != null then overrideLibcxx stdenv' else stdenv';
+    stdenv = overrideCC pkgs.stdenv clang;
 
     swift-unwrapped = callPackage ./compiler {
       inherit (darwin) DarwinTools sigtool;

diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -28,7 +28,6 @@
   dconf,
   llvmPackages_15,
   overrideSDK,
-  overrideLibcxx,
   darwin,
 
   # options
@@ -332,7 +331,7 @@ let
         #   starting with clang 16. Patches are available upstream that can be backported.
         # Because the first error is non-trivial to fix and suppressing it risks future breakage,
         # clang is pinned to clang 15. That also makes fixing the second set of errors unnecessary.
-        stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_15.stdenv else stdenv;
+        stdenv = if stdenv.cc.isClang then llvmPackages_15.stdenv else stdenv;
         inherit (srcs.qtwebengine) version;
         inherit (darwin) bootstrap_cmds;
         python = python3;

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -10475,7 +10475,7 @@ with pkgs;
       inherit (__splicedPackages)
         makeScopeWithSplicing' generateSplicesForMkScope lib fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper
         bison cups dconf harfbuzz libGL perl gtk3 python3
-        llvmPackages_15 overrideSDK overrideLibcxx
+        llvmPackages_15 overrideSDK
         darwin;
       inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base;
       inherit config;