Skip to content

qt-{5,6}.qtbase: fix build after Darwin stdenv bump#234900

Closed
reckenrode wants to merge 2 commits intoNixOS:masterfrom
reckenrode:qtbase-darwin-stdenv
Closed

qt-{5,6}.qtbase: fix build after Darwin stdenv bump#234900
reckenrode wants to merge 2 commits intoNixOS:masterfrom
reckenrode:qtbase-darwin-stdenv

Conversation

@reckenrode
Copy link
Copy Markdown
Contributor

qt-{5,6}.qtbase: fix build after Darwin stdenv bump

Description of changes

This is targeting master because it shouldn’t cause any rebuilds, but I can retarget staging anyway if that would be preferred. I tested these changes using my local branch, which is waiting on #234859 before I submit the PR for the rework.

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/)
  • 23.05 Release Notes (or backporting 22.11 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
  • Fits CONTRIBUTING.md.

When the Darwin stdenv is updated to LLVM 15+, it will switch to
cctools-llvm. The ranlib it provides does not require
`-no_warning_for_no_symbols` or support `-s`.
When the Darwin stdenv is updated to LLVM 15+, it will switch to
cctools-llvm. The ranlib it provides does not require
`-no_warning_for_no_symbols` or support `-s`.
@reckenrode reckenrode requested a review from ttuegel as a code owner May 30, 2023 00:10
@github-actions github-actions bot added the 6.topic: qt/kde Object-oriented framework for GUI creation label May 30, 2023
@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels May 30, 2023
@reckenrode
Copy link
Copy Markdown
Contributor Author

Closing since cctools-llvm won’t be replacing ranlib for now.

@reckenrode reckenrode closed this Jun 3, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: darwin Running or building packages on Darwin 6.topic: qt/kde Object-oriented framework for GUI creation 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant