* 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

3 files changed, 9 insertions, 55 deletions

diff --git a/pkgs/data/misc/xkeyboard-config/0.9.nix b/pkgs/data/misc/xkeyboard-config/0.9.nix
deleted file mode 100644
index c7c92cd6c27b..000000000000
--- a/pkgs/data/misc/xkeyboard-config/0.9.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-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
deleted file mode 100644
index de67b00baeab..000000000000
--- a/pkgs/data/misc/xkeyboard-config/1.2.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-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/default.nix b/pkgs/data/misc/xkeyboard-config/default.nix
index 31836d24ecf9..c36f83aa153e 100644
--- a/pkgs/data/misc/xkeyboard-config/default.nix
+++ b/pkgs/data/misc/xkeyboard-config/default.nix
@@ -1,23 +1,22 @@
-{stdenv, fetchurl, perl, perlXMLParser, xkbcomp}:
+{stdenv, fetchurl, perl, perlXMLParser, xkbcomp, gettext, intltool}:
 
 stdenv.mkDerivation {
-  name = "xkeyboard-config-0.9";
+  name = "xkeyboard-config-1.4";
 
   src = fetchurl {
-    url = http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-0.9.tar.bz2;
-    sha256 = "0zbpprhlv8ggsvgnwqw8d4cx0ry86szm36ghigwb1sn46q0c915v";
+    url = http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-1.4.tar.bz2;
+    sha256 = "1qdhhc5ji8677dna9qj6kisgpfzhpjmaavdjzvvrv9chrxyqa6lj";
   };
 
-  buildInputs = [perl perlXMLParser xkbcomp];
+  buildInputs = [perl perlXMLParser xkbcomp gettext intltool];
 
   ICONV = "iconv";
 
-  preConfigure = "
-    configureFlags=\"--with-xkb-base=$out/etc/X11/xkb -with-xkb-rules-symlink=xorg,xfree86\"
-  ";
+  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
+    cat ${./level3-deadkeys-us-intl} >> $out/etc/X11/xkb/symbols/us
   '';
 }