xorg xkeyboard-config: update, unify with the other expression
This commit is contained in:
Vladimír Čunát
parent
b27477054f
commit
546bd7738d
7 changed files with 7 additions and 198 deletions
|
|
@ -1,25 +0,0 @@
|
|||
{ stdenv, fetchurl, perl, perlXMLParser, xkbcomp, gettext, intltool }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xkeyboard-config-2.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/data/xkeyboard-config/${name}.tar.bz2";
|
||||
sha256 = "08c3mjdgp7c2v6lj5bymaczcazklsd7s1lxslxbngzmh5yhphd74";
|
||||
};
|
||||
|
||||
buildInputs = [ gettext ];
|
||||
|
||||
nativeBuildInputs = [ perl perlXMLParser intltool xkbcomp ];
|
||||
|
||||
patches = [ ./eo.patch ];
|
||||
|
||||
preConfigure = ''
|
||||
configureFlags="--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86 --disable-runtime-deps"
|
||||
sed -e 's@#!\s*/bin/bash@#! /bin/sh@' -i rules/merge.sh
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
cat ${./level3-deadkeys-us-intl} >> $out/etc/X11/xkb/symbols/us
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
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 ] };
|
||||
+};
|
||||
|
|
@ -1,95 +0,0 @@
|
|||
|
||||
// Grabbed from http://lists.freedesktop.org/archives/xorg/2007-July/026686.html
|
||||
// Submitted there by Adriaan van Nijendaal, he says he submitted it to X.org
|
||||
// for inclusion, so it should be OK to use it as if it were part of X.org
|
||||
|
||||
// The keyboard section in the X-server config file
|
||||
// (/etc/X11/xorg.conf on my system) looks like this:
|
||||
//
|
||||
// Section "InputDevice"
|
||||
// Driver "kbd"
|
||||
// Identifier "Keyboard[0]"
|
||||
// Option "XkbModel" "pc101"
|
||||
// Option "XkbLayout" "us"
|
||||
// Option "XkbVariant" "altgr-intl"
|
||||
// EndSection
|
||||
//
|
||||
// To be effective, you need to install this file, change the X config
|
||||
// file and restart the X-server. Or, alternatively, you can do this
|
||||
// run-time:
|
||||
//
|
||||
// setxkbmap -v -rules xorg -model pc101 -layout us -variant altgr-intl
|
||||
//
|
||||
// Once the X-server has loaded the new config, a keyboard can be
|
||||
// displayed with: (if you change "-ll 1" into "-ll 2", you'll see
|
||||
// the special keys ONLY.)
|
||||
//
|
||||
// xkbcomp -o /tmp/keyboard.xkm -opt cgkst -xkb $DISPLAY
|
||||
// xkbprint -o /tmp/keyboard.xkm.ps -kc -nkg 2 -ntg 4 -lg 1 -ll 1 \
|
||||
// -lc en_US.iso885915 -level2 -mono -label symbols -w 3 $DISPLAY;
|
||||
// gv -seascape /tmp/keyboard.xkm.ps
|
||||
// rm -f /tmp/keyboard.xkm.ps /tmp/keyboard.xkm
|
||||
//
|
||||
|
||||
partial hidden alphanumeric_keys
|
||||
xkb_symbols "altgr-intl-rich" {
|
||||
|
||||
name[Group1]= "U.S. English - International (AltGr dead keys)";
|
||||
|
||||
include "us(basic)"
|
||||
|
||||
key <TLDE> { [ grave, asciitilde, dead_grave, dead_tilde ] };
|
||||
key <AE01> { [ 1, exclam, onesuperior, exclamdown ] };
|
||||
key <AE02> { [ 2, at, twosuperior, dead_doubleacute] };
|
||||
key <AE03> { [ 3, numbersign, threesuperior, dead_macron ] };
|
||||
key <AE04> { [ 4, dollar, currency, sterling ] };
|
||||
key <AE05> { [ 5, percent, EuroSign, approxeq ] };
|
||||
key <AE06> { [ 6, asciicircum, dead_circumflex, dead_stroke ] };
|
||||
key <AE07> { [ 7, ampersand, dead_horn ] };
|
||||
key <AE08> { [ 8, asterisk, dead_ogonek, infinity ] };
|
||||
key <AE09> { [ 9, parenleft, leftsinglequotemark,dead_breve ] };
|
||||
key <AE10> { [ 0, parenright,rightsinglequotemark,dead_abovering ] };
|
||||
key <AE11> { [ minus, underscore, yen, dead_belowdot ] };
|
||||
key <AE12> { [ equal, plus, multiply, division ] };
|
||||
|
||||
key <AD01> { [ q, Q, adiaeresis, Adiaeresis ] };
|
||||
key <AD02> { [ w, W, aring, Aring ] };
|
||||
key <AD03> { [ e, E, eacute, Eacute ] };
|
||||
key <AD04> { [ r, R, ediaeresis, Ediaeresis ] };
|
||||
key <AD05> { [ t, T, thorn, THORN ] };
|
||||
key <AD06> { [ y, Y, udiaeresis, Udiaeresis ] };
|
||||
key <AD07> { [ u, U, uacute, Uacute ] };
|
||||
key <AD08> { [ i, I, iacute, Iacute ] };
|
||||
key <AD09> { [ o, O, oacute, Oacute ] };
|
||||
key <AD10> { [ p, P, odiaeresis, Odiaeresis ] };
|
||||
key <AD11> { [ bracketleft, braceleft, guillemotleft, lessthanequal ] };
|
||||
key <AD12> { [ bracketright,braceright, guillemotright, greaterthanequal] };
|
||||
|
||||
key <AC01> { [ a, A, aacute, Aacute ] };
|
||||
key <AC02> { [ s, S, ssharp, section ] };
|
||||
key <AC03> { [ d, D, eth, ETH ] };
|
||||
key <AC04> { [ f, F, union, intersection ] };
|
||||
key <AC05> { [ g, G, eng, ENG ] };
|
||||
key <AC06> { [ h, H, hyphen, nobreakspace ] };
|
||||
key <AC07> { [ j, J, idiaeresis, Idiaeresis ] };
|
||||
key <AC08> { [ k, K ] };
|
||||
key <AC09> { [ l, L, oslash, Ooblique ] };
|
||||
key <AC10> { [semicolon, colon, paragraph, degree ] };
|
||||
key <AC11> { [apostrophe, quotedbl, dead_acute, dead_diaeresis ] };
|
||||
|
||||
key <AB01> { [ z, Z, ae, AE ] };
|
||||
key <AB02> { [ x, X, oe, OE ] };
|
||||
key <AB03> { [ c, C, copyright, cent ] };
|
||||
key <AB04> { [ v, V, registered, trademark ] };
|
||||
key <AB05> { [ b, B, emdash, endash ] };
|
||||
key <AB06> { [ n, N, nu, numerosign ] };
|
||||
key <AB07> { [ m, M, mu, plusminus ] };
|
||||
key <AB08> { [ comma, less, ccedilla, Ccedilla ] };
|
||||
key <AB09> { [ period, greater, dead_abovedot, dead_caron ] };
|
||||
key <AB10> { [ slash, question, questiondown, dead_hook ] };
|
||||
key <BKSL> { [backslash, bar, notsign, brokenbar ] };
|
||||
|
||||
// Let's have free choice
|
||||
//include "level3(ralt_switch)"
|
||||
};
|
||||
|
||||
|
|
@ -1830,11 +1830,11 @@ let
|
|||
})) // {inherit inputproto libX11 libXaw xproto libXt ;};
|
||||
|
||||
xkeyboardconfig = (stdenv.mkDerivation ((if overrides ? xkeyboardconfig then overrides.xkeyboardconfig else x: x) {
|
||||
name = "xkeyboard-config-2.8";
|
||||
name = "xkeyboard-config-2.11";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.8.tar.bz2;
|
||||
sha256 = "1bkq415qw4r3dl139mqgal9v585x7kh3km6z1lraz2j8im3ga72f";
|
||||
url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.11.tar.bz2;
|
||||
sha256 = "0xkdyyi759hzls42hp4j3q2lc35n4j6b2g44ilx5qarci5h584p7";
|
||||
};
|
||||
buildInputs = [pkgconfig libX11 xproto ];
|
||||
})) // {inherit libX11 xproto ;};
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ in
|
|||
postInstall =
|
||||
''
|
||||
mkdir -p $out/share
|
||||
ln -sfn ${args.xkeyboard_config}/etc/X11 $out/share/X11
|
||||
ln -sfn ${xorg.xkeyboardconfig}/etc/X11 $out/share/X11
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@ mirror://xorg/X11R7.7/src/everything/xinput-1.6.0.tar.bz2
|
|||
mirror://xorg/X11R7.7/src/everything/xkbcomp-1.2.4.tar.bz2
|
||||
mirror://xorg/X11R7.7/src/everything/xkbevd-1.1.3.tar.bz2
|
||||
mirror://xorg/X11R7.7/src/everything/xkbutils-1.0.3.tar.bz2
|
||||
mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.8.tar.bz2
|
||||
mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.11.tar.bz2
|
||||
mirror://xorg/X11R7.7/src/everything/xkill-1.0.3.tar.bz2
|
||||
mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2
|
||||
mirror://xorg/X11R7.7/src/everything/xlsclients-1.1.2.tar.bz2
|
||||
|
|
|
|||
|
|
@ -6343,7 +6343,7 @@ let
|
|||
xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
|
||||
inherit fetchurl fetchgit stdenv pkgconfig intltool freetype fontconfig
|
||||
libxslt expat libdrm libpng zlib perl mesa_drivers
|
||||
xkeyboard_config dbus libuuid openssl gperf m4
|
||||
dbus libuuid openssl gperf m4
|
||||
autoconf libtool xmlto asciidoc udev flex bison python mtdev pixman;
|
||||
automake = automake110x;
|
||||
mesa = mesa_noglu;
|
||||
|
|
@ -7281,7 +7281,7 @@ let
|
|||
|
||||
xhtml1 = callPackage ../data/sgml+xml/schemas/xml-dtd/xhtml1 { };
|
||||
|
||||
xkeyboard_config = callPackage ../data/misc/xkeyboard-config { };
|
||||
xkeyboard_config = xorg.xkeyboardconfig;
|
||||
|
||||
|
||||
### APPLICATIONS
|
||||
|
|
|
|||
Loading…
Reference in a new issue