diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2009-05-05 09:55:20 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2009-05-05 09:55:20 +0000 |
| commit | 01548fb7b999c357b1ae648bc564408fbd432a9a (patch) | |
| tree | 7b6ea01a7680a809aad3a6df146a5d8430590321 /pkgs/data | |
| parent | 88ada9468bdbe678d8028b850f7a49681802a668 (diff) | |
| download | nixpkgs-01548fb7b999c357b1ae648bc564408fbd432a9a.tar nixpkgs-01548fb7b999c357b1ae648bc564408fbd432a9a.tar.gz nixpkgs-01548fb7b999c357b1ae648bc564408fbd432a9a.tar.bz2 nixpkgs-01548fb7b999c357b1ae648bc564408fbd432a9a.tar.lz nixpkgs-01548fb7b999c357b1ae648bc564408fbd432a9a.tar.xz nixpkgs-01548fb7b999c357b1ae648bc564408fbd432a9a.tar.zst nixpkgs-01548fb7b999c357b1ae648bc564408fbd432a9a.zip | |
xkeyboard-config update to 1.5
svn path=/nixpkgs/trunk/; revision=15448
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/misc/xkeyboard-config/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/data/misc/xkeyboard-config/default.nix b/pkgs/data/misc/xkeyboard-config/default.nix index c36f83aa153..9e5b9f9e4d8 100644 --- a/pkgs/data/misc/xkeyboard-config/default.nix +++ b/pkgs/data/misc/xkeyboard-config/default.nix @@ -1,11 +1,13 @@ {stdenv, fetchurl, perl, perlXMLParser, xkbcomp, gettext, intltool}: +let version = "1.5"; in + stdenv.mkDerivation { - name = "xkeyboard-config-1.4"; + name = "xkeyboard-config-${version}"; src = fetchurl { - url = http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-1.4.tar.bz2; - sha256 = "1qdhhc5ji8677dna9qj6kisgpfzhpjmaavdjzvvrv9chrxyqa6lj"; + url = "http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${version}.tar.bz2"; + sha256 = "1r276ik3x0jg77zza37ggrnp7zbdvmjyrm9mwxxgzh3bmligy5ff"; }; buildInputs = [perl perlXMLParser xkbcomp gettext intltool]; @@ -14,6 +16,7 @@ stdenv.mkDerivation { preConfigure = '' configureFlags="--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86" + sed -e 's@#!\s*/bin/bash@#! /bin/sh@' -i rules/merge.sh ''; postInstall = '' diff --git a/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl b/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl index 3a80b3be0ae..d3120f3aac1 100644 --- a/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl +++ b/pkgs/data/misc/xkeyboard-config/level3-deadkeys-us-intl @@ -32,7 +32,7 @@ // partial hidden alphanumeric_keys -xkb_symbols "altgr-intl" { +xkb_symbols "altgr-intl-rich" { name[Group1]= "U.S. English - International (AltGr dead keys)"; |