* intltool: deleted redundant copy (it's already in the Gnome Nix

expressions).
* Fixed xkbcomp: it no longer found the keyboard definitions since it
  disregards the -R option passed by the X server (it chdirs to the -R
  path, but "." has been removed from the xkbcomp search path in
  xkbcomp 1.0.5).  Build it with /etc/X11/xkb as its default
  location.  This is less pure but it does allow for updating
  xkeyboard-config in a running server.
* xkeyboard-config: updated to 1.4.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13018
This commit is contained in:
Eelco Dolstra
2008-10-09 12:12:58 +00:00
parent 9fa8276ae5
commit 5eef7df51d
7 changed files with 17 additions and 89 deletions
@@ -1,26 +0,0 @@
args : with args;
let localDefs = builderDefs.meta.function {
src = /* put a fetchurl here */
fetchurl {
url = http://ftp.gnome.org/pub/gnome/sources/intltool/0.36/intltool-0.36.2.tar.bz2;
sha256 = "0cfblqz3k5s4rsw6rx9f5v3izsrmrs96293rb7bd02vijbah9gxj";
};
propagatedBuildInputs = [perl perlXMLParser];
configureFlags = [];
};
in with localDefs;
stdenv.mkDerivation rec {
name = "intltool-0.36.2";
builder = writeScript (name + "-builder")
(textClosure localDefs [minInit addInputs doUnpack
(doDump "1") doConfigure doMakeInstall
doPropagate doForceShare]);
inherit propagatedBuildInputs;
meta = {
description = "
Internalization tool for XML.
";
inherit src;
};
}