diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-03-27 21:34:06 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-03-27 21:34:06 +0100 |
commit | 576e9289dd85a32187f92823a4c23979ad9d0709 (patch) | |
tree | b9db30b6900dfd1caf1f0a5ed85826ed5e65e831 /pkgs/servers/x11 | |
parent | 151ac5ab9e4fd445b23fcfb6be7681129d544f23 (diff) | |
parent | 9bde84a75d1ca5d60b1c21abab405206e0e5742c (diff) | |
download | nixlib-576e9289dd85a32187f92823a4c23979ad9d0709.tar nixlib-576e9289dd85a32187f92823a4c23979ad9d0709.tar.gz nixlib-576e9289dd85a32187f92823a4c23979ad9d0709.tar.bz2 nixlib-576e9289dd85a32187f92823a4c23979ad9d0709.tar.lz nixlib-576e9289dd85a32187f92823a4c23979ad9d0709.tar.xz nixlib-576e9289dd85a32187f92823a4c23979ad9d0709.tar.zst nixlib-576e9289dd85a32187f92823a4c23979ad9d0709.zip |
Merge master into x-updates
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/xkeyboard-config-eo.patch | 71 |
2 files changed, 74 insertions, 1 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index ead54a58a6bf..043bdc99cb78 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -205,10 +205,12 @@ in }; xkeyboardconfig = attrs: attrs // { - #TODO: resurrect patches for US_intl and Esperanto? buildInputs = attrs.buildInputs ++ [args.intltool]; + #TODO: resurrect patches for US_intl? + patches = [ ./xkeyboard-config-eo.patch ]; + # 1: compatibility for X11/xkb location # 2: I think pkgconfig/ is supposed to be in /lib/ postInstall = '' diff --git a/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch b/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch new file mode 100644 index 000000000000..f288a5c0f6dd --- /dev/null +++ b/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch @@ -0,0 +1,71 @@ +diff --git a/rules/base.xml.in b/rules/base.xml.in +index ec321f8..e9c3546 100644 +--- a/rules/base.xml.in ++++ b/rules/base.xml.in +@@ -1786,6 +1786,13 @@ + </layout> + <layout> + <configItem> ++ <name>eo</name> ++ <_shortDescription>Esp</_shortDescription> ++ <_description>Esperanto</_description> ++ </configItem> ++ </layout> ++ <layout> ++ <configItem> + <name>ir</name> + <_shortDescription>Irn</_shortDescription> + <_description>Iran</_description> +diff --git a/symbols/Makefile.am b/symbols/Makefile.am +index 97c816d..d7e3a4e 100644 +--- a/symbols/Makefile.am ++++ b/symbols/Makefile.am +@@ -10,7 +10,7 @@ bt by braille \ + ca cd \ + ch cn cz \ + de dk \ +-ee es et epo \ ++ee eo es et epo \ + fi fo fr \ + gb ge gh gn \ + gr hr hu \ +diff --git a/symbols/Makefile.in b/symbols/Makefile.in +index b5be077..5cddcc7 100644 +--- a/symbols/Makefile.in ++++ b/symbols/Makefile.in +@@ -222,7 +222,7 @@ bt by braille \ + ca cd \ + ch cn cz \ + de dk \ +-ee es et epo \ ++ee eo es et epo \ + fi fo fr \ + gb ge gh gn \ + gr hr hu \ +diff --git a/symbols/eo b/symbols/eo +new file mode 100644 +index 0000000..d6358c9 +--- /dev/null ++++ b/symbols/eo +@@ -0,0 +1,21 @@ ++// $XFree86$ ++ ++partial alphanumeric_keys ++xkb_symbols "basic" { ++ ++ // Describes the differences between a very simple en_US ++ // keyboard and a simple Esperanto keyboard ++ // Press AltGr or Windows Menu key together with C, H, J, S, U ++ // to get accented letters. ++ // 2001 by Radovan Garabik <garabik@melkor.dnp.fmph.uniba.sk> ++ ++ key.type = "FOUR_LEVEL"; ++ ++ key <AD02> { [w,W, ubreve,Ubreve ] }; ++ key <AD07> { [u,U, ubreve, Ubreve ] }; ++ key <AC02> { [s,S, scircumflex, Scircumflex ] }; ++ key <AC05> { [g,G, gcircumflex,Gcircumflex ] }; ++ key <AC06> { [h,H, hcircumflex,Hcircumflex ] }; ++ key <AC07> { [j,J, jcircumflex,Jcircumflex ] }; ++ key <AB03> { [c,C, ccircumflex,Ccircumflex ] }; ++}; |