Author: eelco
Date: Sun Jul 18 21:51:33 2010
New Revision: 22633
URL: https://svn.nixos.org/websvn/nix/?rev=22633&sc=1
Log:
* xkeyboard-config updated to 1.9.
Modified:
nixpkgs/branches/x-updates/pkgs/data/misc/xkeyboard-config/default.nix
Modified: nixpkgs/branches/x-updates/pkgs/data/misc/xkeyboard-config/default.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/data/misc/xkeyboard-config/default.nix
Sun Jul 18 21:51:13 2010 (r22632)
+++ nixpkgs/branches/x-updates/pkgs/data/misc/xkeyboard-config/default.nix
Sun Jul 18 21:51:33 2010 (r22633)
@@ -1,21 +1,17 @@
{stdenv, fetchurl, perl, perlXMLParser, xkbcomp, gettext, intltool}:
-let version = "1.5"; in
-
-stdenv.mkDerivation {
- name = "xkeyboard-config-${version}";
+stdenv.mkDerivation rec {
+ name = "xkeyboard-config-1.9";
src = fetchurl {
- url =
"http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${version}.tar.bz2";;
- sha256 = "1r276ik3x0jg77zza37ggrnp7zbdvmjyrm9mwxxgzh3bmligy5ff";
+ url = "mirror://xorg/individual/data/xkeyboard-config/${name}.tar.bz2";
+ sha256 = "0df2iad598pxw3fzkx10f7irqah0fgawx262d07s04x0whn9ql9b";
};
buildInputs = [perl perlXMLParser xkbcomp gettext intltool];
patches = [ ./eo.patch ];
- ICONV = "iconv";
-
preConfigure = ''
configureFlags="--with-xkb-base=$out/etc/X11/xkb
-with-xkb-rules-symlink=xorg,xfree86"
sed -e 's...@#!\s*/bin/b...@#! /bin/sh@' -i rules/merge.sh
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
