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

nixos/xserver: refactor/fix xml tags for keyboard layout overrides #67181

Closed
wants to merge 3 commits into from

Conversation

@dasj19
Copy link
Contributor

commented Aug 21, 2019

Motivation for this change

With the current XML tags there is an issue when building with a custom keyboard.
As described here: #47764 (comment) the description of the new keyboard layout will be missing in the built file: xkeyboard-config-2.27/share/X11/xkb/rules/evdev.lst

@rnhmjoj explains that this broke when xkb dropped intltool ... #47764 (comment)

Things done

I built with https://github.com/NixOS/nixpkgs/pull/47764#issuecomment-523237183 and checked the output in xkeyboard-config-2.27/share/X11/xkb/rules/evdev.lst

  • 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.
Notify maintainers

cc @rnhmjoj

Copy link
Contributor

left a comment

Thank you.

@worldofpeace

This comment has been minimized.

Copy link
Member

commented Aug 21, 2019

Looks good, @dasj19 can you make commit msg the title of your PR? (and with a summary in the body)

dasj19 added 2 commits Aug 18, 2019
With the current XML tags there is an issue when building with a custom keyboard.
The description of the new keyboard layout will be missing in the built file: xkeyboard-config-2.27/share/X11/xkb/rules/evdev.lst
…o fix-custom-xkb-layout
@dasj19

This comment has been minimized.

Copy link
Contributor Author

commented Aug 21, 2019

@worldofpeace I just did that with git commit --amend ... hope I did not mess anything up, this is my first contribution to this project.

@rnhmjoj

This comment has been minimized.

Copy link
Contributor

commented Aug 21, 2019

@dasj19: in general you should use git rebase -i: it can squash commits into a single one, rearrange or change the commit title.

@dasj19 dasj19 referenced this pull request Sep 9, 2019
7 of 10 tasks complete
@dasj19

This comment has been minimized.

Copy link
Contributor Author

commented Sep 9, 2019

closed as #68310 was merged, and it contained the same changes I was proposing here

@dasj19 dasj19 closed this Sep 9, 2019
@dasj19 dasj19 deleted the dasj19:fix-custom-xkb-layout branch Sep 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.