From 9a86ad2f7f3c4fd37b90cba98b935e2f64902bf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 16 Feb 2014 11:25:49 +0100
Subject: [PATCH] xorg.xkeyboard-config: commit forgotten fixups

Without these there was also a mysterious collision in nixos etc generation.
---
 pkgs/servers/x11/xorg/overrides.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 499d78b947e5..8b2617f06216 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -197,7 +197,16 @@ in
   };
 
   xkeyboardconfig = attrs: attrs // {
+    #TODO: resurrect patches for US_intl and Esperanto?
+
     buildInputs = attrs.buildInputs ++ [args.intltool];
+
+    # 1: compatibility for X11/xkb location
+    # 2: I think pkgconfig/ is supposed to be in /lib/
+    postInstall = ''
+      ln -s share "$out/etc"
+      mkdir "$out/lib" && ln -s ../share/pkgconfig "$out/lib/"
+    '';
   };
 
   xmodmap = attrs: attrs // {