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.

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

[release-24.11] qt6.qtwebengine: fix build on darwin #372849

Merged
merged 2 commits into from
Jan 17, 2025

Conversation

azuwis
Copy link
Contributor

@azuwis azuwis commented Jan 11, 2025

  • make the AppleClang substitution unconditional
  • Disable metal shader compilation
  • Use clang 17

CC @emilazy

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

So we won't break darwin build if the package is updated
- Disable metal shader compilation
- Use clang 17
@azuwis
Copy link
Contributor Author

azuwis commented Jan 11, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 372849


aarch64-darwin

✅ 2 packages built:
  • qt6.qtwebengine
  • qt6.qtwebengine.dev (qt6.qtwebengine.dev.dev)

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jan 12, 2025
Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

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

Builds on x86_64-darwin. Thanks!

@emilazy emilazy merged commit 0ab8bde into NixOS:release-24.11 Jan 17, 2025
23 of 25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants