* xkeyboard-config updated to 1.9.
svn path=/nixpkgs/branches/x-updates/; revision=22633
This commit is contained in:
parent
662600c241
commit
8e168422fb
|
@ -1,21 +1,17 @@
|
||||||
{stdenv, fetchurl, perl, perlXMLParser, xkbcomp, gettext, intltool}:
|
{stdenv, fetchurl, perl, perlXMLParser, xkbcomp, gettext, intltool}:
|
||||||
|
|
||||||
let version = "1.5"; in
|
stdenv.mkDerivation rec {
|
||||||
|
name = "xkeyboard-config-1.9";
|
||||||
stdenv.mkDerivation {
|
|
||||||
name = "xkeyboard-config-${version}";
|
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${version}.tar.bz2";
|
url = "mirror://xorg/individual/data/xkeyboard-config/${name}.tar.bz2";
|
||||||
sha256 = "1r276ik3x0jg77zza37ggrnp7zbdvmjyrm9mwxxgzh3bmligy5ff";
|
sha256 = "0df2iad598pxw3fzkx10f7irqah0fgawx262d07s04x0whn9ql9b";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [perl perlXMLParser xkbcomp gettext intltool];
|
buildInputs = [perl perlXMLParser xkbcomp gettext intltool];
|
||||||
|
|
||||||
patches = [ ./eo.patch ];
|
patches = [ ./eo.patch ];
|
||||||
|
|
||||||
ICONV = "iconv";
|
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
configureFlags="--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86"
|
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
|
sed -e 's@#!\s*/bin/bash@#! /bin/sh@' -i rules/merge.sh
|
||||||
|
|
Loading…
Reference in New Issue