xorg-server variants: eradicate symlink to /var/tmp

- Fixes #19673; it caused problems in combination with buildEnv. - As noted, X falls back to /tmp: #19673 (comment) - 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: 9d15693. (cherry picked from commit 33abc70)
NixOS · Dec 18, 2016 · fa20c0c · fa20c0c
1 parent 84a3c52
commit fa20c0c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
@@ -453,8 +453,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 \
             --set XKB_BINDIR "${xorg.xkbcomp}/bin" \
             --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb"
@@ -506,7 +505,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
@@ -25,7 +25,6 @@ overrideDerivation xorgserver (oldAttrs: {
 
   postInstall = ''
     rm -fr $out/share/X11/xkb/compiled
-    ln -s /var/tmp $out/share/X11/xkb/compiled
   '';
 
 }) // {