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

Jump to bottom

[Backport release-21.11] llvmPackages_13.libcxx: fix darwin build #147514

Merged
merged 2 commits into from
Nov 26, 2021
Merged

[Backport release-21.11] llvmPackages_13.libcxx: fix darwin build #147514

merged 2 commits into from
Nov 26, 2021

Conversation

midchildan
Copy link
Member

Motivation for this change

Backport #147289

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Nov 26, 2021
midchildan
midchildan commented Nov 26, 2021
View reviewed changes
pkgs/top-level/all-packages.nix
Comment on lines +12561 to +12562
} // lib.optionalAttrs stdenv.hostPlatform.isDarwin {
inherit (llvmPackages_11) stdenv;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change isn't present in the original PR. It is necessary here because the Darwin stdenv in staging-21.11 uses LLVM 7, which refuses to compile libcxx from LLVM 13.

@risicle
Copy link
Contributor

risicle commented Nov 26, 2021

Builds for me, macos 10.15 & nixos x86_64.

@risicle
Copy link
Contributor

risicle commented Nov 26, 2021

#144627

@domenkozar domenkozar merged commit af2b7bf into NixOS:staging-21.11 Nov 26, 2021
@midchildan midchildan deleted the fix/libcxx-darwin-staging branch November 27, 2021 03:04
@midchildan midchildan mentioned this pull request Nov 28, 2021
Merged
13 tasks
@rrbutani rrbutani added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label May 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer Awaiting requested review from matthewbauer matthewbauer is a code owner

@lovek323 lovek323 Awaiting requested review from lovek323

@dtzWill dtzWill Awaiting requested review from dtzWill

@primeos primeos Awaiting requested review from primeos

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@midchildan @risicle @domenkozar @rrbutani