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

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

Merged
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.
@worldofpeace
Copy link
Member

@worldofpeace worldofpeace commented Feb 6, 2020

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 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 veprbl commented Feb 7, 2020

@GrahamcOfBorg build libxkbcommon

@veprbl
veprbl approved these changes Feb 7, 2020
@veprbl veprbl merged commit 7895649 into NixOS:master Feb 7, 2020
15 of 16 checks passed
15 of 16 checks passed
libxkbcommon on x86_64-linux
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
libxkbcommon on aarch64-linux Success
Details
libxkbcommon on x86_64-darwin Success
Details
@clkamp clkamp deleted the clkamp:fix-libxkbcommon branch Feb 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.