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

Jump to bottom

libxkbcommon: fix build on darwin: patch is already in upstream #79393

Merged
merged 1 commit into from Feb 7, 2020
Merged

libxkbcommon: fix build on darwin: patch is already in upstream #79393

merged 1 commit into from Feb 7, 2020

Conversation

clkamp
Copy link
Contributor

@clkamp clkamp commented Feb 6, 2020

Motivation for this change

This should fix the broken build of libxkbcommon on darwin since
https://hydra.nixos.org/build/111395871

The removed patch is from upstream and already included in the 0.10.0 release
(see xkbcommon/libxkbcommon@32d178b)

But it is not tested since I don't have a darwin system available

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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.

@clkamp clkamp requested a review from ttuegel February 6, 2020 22:16
@worldofpeace
Copy link
Contributor

hey, I remember when I made that patch. LGTM, but you need to target this PR to staging with git rebase --onto

@marsam
Copy link
Contributor

marsam commented Feb 7, 2020

@worldofpeace IMHO it can go directly to master since it only affects broken packages on darwin

@veprbl
Copy link
Member

veprbl commented Feb 7, 2020

@GrahamcOfBorg build libxkbcommon

@veprbl veprbl merged commit 7895649 into NixOS:master Feb 7, 2020
@clkamp clkamp deleted the fix-libxkbcommon branch February 7, 2020 09:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@veprbl veprbl veprbl approved these changes

@ttuegel ttuegel Awaiting requested review from ttuegel

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 0 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@clkamp @worldofpeace @marsam @veprbl @Janik-Haag