Skip to content

mesa: unbreak on darwin#272166

Merged
veprbl merged 2 commits intoNixOS:masterfrom
veprbl:pr/mesa_darwin_fix
Dec 5, 2023
Merged

mesa: unbreak on darwin#272166
veprbl merged 2 commits intoNixOS:masterfrom
veprbl:pr/mesa_darwin_fix

Conversation

@veprbl
Copy link
Member

@veprbl veprbl commented Dec 5, 2023 •
edited
Loading

Description of changes

Unbreaks mesa on macOS, cc #233265

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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.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.

Add a 👍 reaction to pull requests you find important.

@veprbl veprbl requested review from reckenrode and yu-re-ka December 5, 2023 00:30
yu-re-ka
yu-re-ka reviewed Dec 5, 2023
View reviewed changes
pkgs/development/libraries/mesa/default.nix

./opencl.patch
./disk_cache-include-dri-driver-path-in-cache-key.patch
] ++ lib.optionals stdenv.isDarwin [
Copy link
Contributor

@yu-re-ka yu-re-ka Dec 5, 2023

Choose a reason for hiding this comment

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

Note that these patches are not in the mesa main branch yet. I am hopeful, but ultimately we might have to disable darwin again if the patches stop applying and haven't been rebased/upstreamed and nobody puts in the effort to do that.

Copy link
Member Author

@veprbl veprbl Dec 5, 2023

Choose a reason for hiding this comment

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

Right, this is understood. They still apply 6 months after, so I'm optimistic. I did ping the upstream issue, to help nudge things forward.

yu-re-ka
yu-re-ka approved these changes Dec 5, 2023
View reviewed changes
Copy link
Contributor

@yu-re-ka yu-re-ka left a comment

Choose a reason for hiding this comment

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

Thank you for looking at this. I don't have a darwin to test (ironically, since I am typing this on a Mac, just not with darwin 😅).

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Dec 5, 2023
@veprbl
libGLU: fix on darwin
f8c8eaf 
Fixes a configuration issue:

    meson.build:33:8: ERROR: requires argument not a string, library with pkgconfig-generated file or pkgconfig-dependency object, got <ExtraFrameworkDependency opengl: True>
@delroth delroth removed the 12.approvals: 1 This PR was reviewed and approved by one person. label Dec 5, 2023
reckenrode
reckenrode approved these changes Dec 5, 2023
View reviewed changes
Copy link
Contributor

@reckenrode reckenrode left a comment

Choose a reason for hiding this comment

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

LGTM

I’m less concerned about these patches breaking in the future because Mesa shouldn’t generally be used on Darwin anyway. If MoltenVK ever gets featureful enough to support Zink, things might be different, but that’s several years away at least.

@delroth delroth added the 12.approvals: 2 This PR was reviewed and approved by two persons. label Dec 5, 2023
@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 8.has: package (new) This PR adds a new package labels Dec 5, 2023
@ofborg ofborg bot requested review from primeos and vcunat December 5, 2023 05:11
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Dec 5, 2023
@veprbl veprbl merged commit dd73443 into NixOS:master Dec 5, 2023
@github-actions github-actions bot mentioned this pull request Dec 5, 2023
Merged
1 task
@github-actions
Copy link
Contributor

github-actions bot commented Dec 5, 2023

Successfully created backport PR for release-23.11:

@quentinmit
Copy link
Contributor

quentinmit commented Dec 5, 2023

There's actually already an upstream patch on mesa's main; see https://gitlab.freedesktop.org/mesa/mesa/-/commit/4ef573735efc7f15d8b8700622a5865d33c34bf1

@veprbl
Copy link
Member Author

veprbl commented Dec 7, 2023

That patch does not apply to the release and looks functionally different. However, taking the commit after the next works: #272732. Thanks for your pointer.

@yuanwang-wf yuanwang-wf mentioned this pull request Oct 14, 2024
Closed
13 tasks
@yuanw yuanw mentioned this pull request Oct 17, 2024
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@reckenrode reckenrode reckenrode approved these changes

@vcunat vcunat Awaiting requested review from vcunat

@primeos primeos Awaiting requested review from primeos

+1 more reviewer

@yu-re-ka yu-re-ka yu-re-ka approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: darwin Running or building packages on Darwin 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 12.approvals: 2 This PR was reviewed and approved by two persons.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@veprbl @quentinmit @reckenrode @yu-re-ka @delroth