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

services.xserver.extraLayouts fixes #68310

Merged
merged 3 commits into from Sep 9, 2019
Merged

services.xserver.extraLayouts fixes #68310

merged 3 commits into from Sep 9, 2019

Conversation

rnhmjoj
Copy link
Contributor

@rnhmjoj rnhmjoj commented Sep 8, 2019

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested in a NixOS VM
  • Tested compilation of all pkgs that depend on this change (nixos manual)
  • Tested execution of all binary files (none)
  • 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 @dasj19 @infinisil

rnhmjoj and others added 3 commits September 8, 2019 14:51
@rnhmjoj
nixos/xserver: export configuration with startx and extra layouts
e57c0f3 
If the X server is run manually it must be started with an `-xkbdir` argument
pointing to the custom xkb directory. So we export it to /etc/X11/xkb.
@rnhmjoj
nixos/doc: inform users of startx about -xkbdir argument needed
7468809
@dasj19 @rnhmjoj
nixos/xserver: refactor/fix xml tags for keyboard layout overrides
e2fca8b 
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
@FRidh FRidh added this to the 19.09 milestone Sep 9, 2019
@lheckemann
Copy link
Member

@GrahamcOfBorg test keymap

@dasj19
Copy link
Contributor

dasj19 commented Sep 9, 2019

This PR makes my PR obsolete: #67181

So when this gets merged the one I referenced must be rejected

@lheckemann
Copy link
Member

Hm, is grahamcofborg on holiday as well?

@lheckemann
Copy link
Member

Tested myself, keymap tests work.

@lheckemann lheckemann merged commit c8c04bc into NixOS:master Sep 9, 2019
@FRidh
Copy link
Member

FRidh commented Sep 9, 2019

Looks like only one x86_64-linux worker is available?
https://monitoring.nix.ci/d/000000002/ofborg?orgId=1&from=1568013635984&to=1568017235984&panelId=8&fullscreen

@rnhmjoj
Copy link
Contributor Author

rnhmjoj commented Sep 9, 2019

Thank you all!

@dasj19 dasj19 mentioned this pull request Sep 9, 2019
Closed
10 tasks
@rnhmjoj rnhmjoj deleted the xkb branch September 14, 2019 08:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: nixos 8.has: documentation 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
19.09
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@rnhmjoj @lheckemann @dasj19 @FRidh