Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

treewide: clean up remnants of overrideLibcxx #370673

Draft
wants to merge 1 commit into
base: staging
Choose a base branch
from
Draft

treewide: clean up remnants of overrideLibcxx #370673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions pkgs/development/compilers/swift/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
llvmPackages,
llvmPackages_15,
overrideCC,
overrideLibcxx,
}:

let
Expand Down Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions pkgs/development/libraries/qt-5/5.15/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
dconf,
llvmPackages_15,
overrideSDK,
overrideLibcxx,
darwin,

# options
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading