From 33abc705b31a294d9e788bda5b0b1708c8eed92d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Dec 2016 18:07:04 +0100
Subject: [PATCH] xorg-server variants: eradicate symlink to /var/tmp

- Fixes #19673; it caused problems in combination with buildEnv.
- As noted, X falls back to /tmp:
  https://github.com/NixOS/nixpkgs/issues/19673#issuecomment-258871876
- Removing the directory is still required, as X would attempt to write
  into it if allowed - and probably succeed in case the user set
  nix.readOnlyStore = false; (X runs as root).
- Archeology link: 9d1569316.
---
 pkgs/servers/x11/xorg/overrides.nix | 4 +---
 pkgs/servers/x11/xorg/xwayland.nix  | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index c87acfee43a8..8d6817441315 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -459,8 +459,7 @@ in
           "--enable-glamor"
         ];
         postInstall = ''
-          rm -fr $out/share/X11/xkb/compiled
-          ln -s /var/tmp $out/share/X11/xkb/compiled
+          rm -fr $out/share/X11/xkb/compiled # otherwise X will try to write in it
           wrapProgram $out/bin/Xephyr \
             --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb"
           wrapProgram $out/bin/Xvfb \
@@ -510,7 +509,6 @@ in
         '';
         postInstall = ''
           rm -fr $out/share/X11/xkb/compiled
-          ln -s /var/tmp $out/share/X11/xkb/compiled
 
           cp -rT ${darwinOtherX}/bin $out/bin
           rm -f $out/bin/X
diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix
index 729fcc2e3447..ee4b5695c7cd 100644
--- a/pkgs/servers/x11/xorg/xwayland.nix
+++ b/pkgs/servers/x11/xorg/xwayland.nix
@@ -25,7 +25,6 @@ overrideDerivation xorgserver (oldAttrs: {
 
   postInstall = ''
     rm -fr $out/share/X11/xkb/compiled
-    ln -s /var/tmp $out/share/X11/xkb/compiled
   '';
 
 }) // {