diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2008-02-03 08:53:47 +0000 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2008-02-03 08:53:47 +0000 |
commit | f6ee57b67f404b4f9480ebb283638b11aa26bdc3 (patch) | |
tree | cab206f7916eeb3d2f75cc4b0fd98f3857e74ad9 /pkgs/data | |
parent | 3547462f7a9445caa4a7dd4ae87e7f3749e71cd3 (diff) | |
download | nixpkgs-f6ee57b67f404b4f9480ebb283638b11aa26bdc3.tar nixpkgs-f6ee57b67f404b4f9480ebb283638b11aa26bdc3.tar.gz nixpkgs-f6ee57b67f404b4f9480ebb283638b11aa26bdc3.tar.bz2 nixpkgs-f6ee57b67f404b4f9480ebb283638b11aa26bdc3.tar.lz nixpkgs-f6ee57b67f404b4f9480ebb283638b11aa26bdc3.tar.xz nixpkgs-f6ee57b67f404b4f9480ebb283638b11aa26bdc3.tar.zst nixpkgs-f6ee57b67f404b4f9480ebb283638b11aa26bdc3.zip |
Added nc6, updated xkeyboard-config
svn path=/nixpkgs/trunk/; revision=10469
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/misc/xkeyboard-config/0.9.nix | 23 | ||||
-rw-r--r-- | pkgs/data/misc/xkeyboard-config/1.2.nix | 22 | ||||
-rw-r--r-- | pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl | 2 |
3 files changed, 46 insertions, 1 deletions
diff --git a/pkgs/data/misc/xkeyboard-config/0.9.nix b/pkgs/data/misc/xkeyboard-config/0.9.nix new file mode 100644 index 00000000000..c7c92cd6c27 --- /dev/null +++ b/pkgs/data/misc/xkeyboard-config/0.9.nix @@ -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 + ''; +} diff --git a/pkgs/data/misc/xkeyboard-config/1.2.nix b/pkgs/data/misc/xkeyboard-config/1.2.nix new file mode 100644 index 00000000000..de67b00baea --- /dev/null +++ b/pkgs/data/misc/xkeyboard-config/1.2.nix @@ -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 + ''; +} diff --git a/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl b/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl index 6b7d263da7f..91d21f76143 100644 --- a/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl +++ b/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl @@ -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 ] }; |