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

libxkbcommon: fix build on darwin #65010

Merged
merged 1 commit into from Jul 18, 2019
Merged

libxkbcommon: fix build on darwin #65010

merged 1 commit into from Jul 18, 2019

Conversation

marsam
Copy link
Contributor

@marsam marsam commented Jul 18, 2019

Motivation for this change

meson tries to build a example file which uses glib's program_invocation_short_name, which is not available on darwin

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jul 18, 2019
@ofborg ofborg bot requested a review from ttuegel July 18, 2019 02:23
@marsam marsam force-pushed the fix-libxkbcommon-darwin-build branch from 08eac1c to 95fadbc Compare July 18, 2019 02:30
@ttuegel ttuegel changed the base branch from master to staging July 18, 2019 11:17
@ttuegel ttuegel changed the base branch from staging to master July 18, 2019 11:17
@ttuegel
Copy link
Member

ttuegel commented Jul 18, 2019

Could you please make this pull request against staging because it is a mass rebuild?

@ofborg ofborg bot requested a review from ttuegel July 18, 2019 11:32
@vcunat
Copy link
Member

vcunat commented Jul 18, 2019

@GrahamcOfBorg build libxkbcommon

vcunat
vcunat approved these changes Jul 18, 2019
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

Seems good, borg confirms the fix. Only rebuilds what's broken already. Upstreaming shouldn't block our merge.

pull bot pushed a commit to evanjs/nixpkgs that referenced this pull request Jul 18, 2019
@vcunat
Merge NixOS#65010: libxkbcommon: fix build on darwin
65a1b17
@worldofpeace
Copy link
Contributor

@vcunat You're correct in that upstreaming shouldn't block the merge.

Typically I'd think merge would be blocked until a patch is submitted upstream.

@vcunat vcunat merged commit 95fadbc into NixOS:master Jul 18, 2019
@worldofpeace
Copy link
Contributor

Guess I'll go ahead and submit one.

@vcunat
Copy link
Member

vcunat commented Jul 18, 2019

I think it was introduced in xkbcommon/libxkbcommon#68 ... but perhaps it's best to submit a PR directly.

@vcunat
Copy link
Member

vcunat commented Jul 18, 2019

Typically I'd think merge would be blocked until a patch is submitted upstream.

I can't see why such a hard rule should exist. Here I see very little risk in going ahead of upstream, and submitting would give no "validation" by itself (though I'd expect feedback soon after that).

@worldofpeace
Copy link
Contributor

It's not exactly a hardrule, it's essentially a good idea to get feedback from them.
So submission equals getting feedback.

@worldofpeace worldofpeace mentioned this pull request Jul 18, 2019
Merged
@marsam marsam deleted the fix-libxkbcommon-darwin-build branch May 31, 2023 05:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace worldofpeace requested changes

@vcunat vcunat vcunat approved these changes

@ttuegel ttuegel Awaiting requested review from ttuegel

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 8.has: package (new) 10.rebuild-darwin: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@marsam @ttuegel @vcunat @worldofpeace