Added nc6, updated xkeyboard-config

svn path=/nixpkgs/trunk/; revision=10469
This commit is contained in:
Michael Raskin
2008-02-03 08:53:47 +00:00
parent 3547462f7a
commit f6ee57b67f
5 changed files with 90 additions and 3 deletions

View File

@@ -0,0 +1,23 @@
args: with args;
stdenv.mkDerivation {
name = "xkeyboard-config-0.9";
src = fetchurl {
url = http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-0.9.tar.bz2;
sha256 = "0zbpprhlv8ggsvgnwqw8d4cx0ry86szm36ghigwb1sn46q0c915v";
};
buildInputs = [perl perlXMLParser xkbcomp];
ICONV = "iconv";
preConfigure = "
configureFlags=\"--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86\"
";
postInstall = ''
rm ''${out}/etc/X11/xkb/compiled
cat ${./level3-deadkeys-us-intl} >> $out/etc/X11/xkb/symbols/us
'';
}

View File

@@ -0,0 +1,22 @@
args: with args;
stdenv.mkDerivation {
name = "xkeyboard-config-${version}";
src = fetchurl {
url = http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-1.2.tar.bz2;
sha256 = "1xr7vfgabgyggnkjb56a0bd39yxjhyrldcdsq9pqnw3izfb6i1b4";
};
buildInputs = [perl perlXMLParser xkbcomp gettext];
ICONV = "iconv";
preConfigure = "
configureFlags=\"--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86\"
";
postInstall = ''
rm ''${out}/etc/X11/xkb/compiled || true;
cat ${./level3-deadkeys-us-intl} | sed -e 's/altgr-intl/altgr-intl-rich/g' >> $out/etc/X11/xkb/symbols/us
'';
}

View File

@@ -44,7 +44,7 @@ xkb_symbols "altgr-intl" {
key <AE03> { [ 3, numbersign, threesuperior, dead_macron ] };
key <AE04> { [ 4, dollar, currency, sterling ] };
key <AE05> { [ 5, percent, EuroSign ] };
key <AE06> { [ 6, asciicircum, dead_circumflex ] };
key <AE06> { [ 6, asciicircum, dead_circumflex, dead_stroke ] };
key <AE07> { [ 7, ampersand, dead_horn ] };
key <AE08> { [ 8, asterisk, dead_ogonek ] };
key <AE09> { [ 9, parenleft, leftsinglequotemark,dead_breve ] };