Skip to content

meson: fix build with case-sensitive store on Darwin#234105

Merged
wegank merged 2 commits intoNixOS:stagingfrom
reckenrode:meson-fix
May 26, 2023
Merged

meson: fix build with case-sensitive store on Darwin#234105
wegank merged 2 commits intoNixOS:stagingfrom
reckenrode:meson-fix

Conversation

@reckenrode
Copy link
Contributor

Description of changes

I run Darwin with a case-sensitive store because it’s offered as an option. Meson is the first thing that actually broke because of it. This patch corrects the casing of “foundation” references in some of the tests that expect to find it.

I did not run nixpkgs-review because this change causes a lot of rebuilds, but I did rebuild a number of packages as part of my work on #229786.

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.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label May 26, 2023
@ofborg ofborg bot requested a review from AndersonTorres May 26, 2023 01:54
@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: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels May 26, 2023
@AndersonTorres
Copy link
Member

Two basic questions:

  1. The case-insensitve store use case will still be functioning?
  2. Shouldn't this patch be sent to Meson developers, too?

As I have said before, I have no access to a Darwin machine.

@reckenrode
Copy link
Contributor Author

The patch shouldn’t affect users on case-insensitive stores. All it does is change the casing of foundation to Foundation on a couple of tests. I have submitted a patch upstream as mesonbuild/meson#11820. I updated my PR here to use fetchpatch instead of including the patch in nixpkgs.

@wegank
Copy link
Member

wegank commented May 26, 2023

@ofborg build meson meson.passthru.tests

@wegank wegank merged commit c3f8494 into NixOS:staging May 26, 2023
@eli-schwartz
Copy link

Shouldn't this patch be sent to Meson developers, too?

It is now merged upstream.

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 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants