From f64beb4b583274fbcf3b3bccdb21bb13ef5ed968 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 26 Nov 2007 13:46:58 +0000 Subject: [PATCH] * Fix a regression in setxkbmap: it couldn't find its rules anymore. svn path=/nixpkgs/trunk/; revision=9794 --- pkgs/servers/x11/xorg/default.nix | 2 +- pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 4cd28a1f938..1a08a5057b1 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1283,7 +1283,7 @@ rec { url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/setxkbmap-1.0.4.tar.bz2; sha256 = "1b1brw1v98q2rqhr5x7f8mr3clxq62nw5175gpamg5s172916nwv"; }; - buildInputs = [pkgconfig libX11 libxkbfile ]; postInstall = "ln -sfn ${xkeyboard_config}/etc $out/share"; + buildInputs = [pkgconfig libX11 libxkbfile ]; postInstall = "ensureDir $out/share/X11; ln -sfn ${xkeyboard_config}/etc/X11/xkb $out/share/X11/"; }) // {inherit libX11 libxkbfile ;}; showfont = (stdenv.mkDerivation { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 9bdf7279f52..31c07aa9afe 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -45,7 +45,7 @@ $extraAttrs{"xorgserver"} = " mesaSrc = mesa.src; x11BuildHook = ./xorgserver.sh $extraAttrs{"imake"} = " inherit xorgcffiles; x11BuildHook = ./imake.sh; patches = [./imake.patch]; "; -$extraAttrs{"setxkbmap"} = " postInstall = \"ln -sfn \${xkeyboard_config}/etc \$out/share\"; "; +$extraAttrs{"setxkbmap"} = " postInstall = \"ensureDir \$out/share/X11; ln -sfn \${xkeyboard_config}/etc/X11/xkb \$out/share/X11/\"; "; $extraAttrs{"fontmiscmisc"} = " postInstall = \"ln -s \${fontalias}/lib/X11/fonts/misc/fonts.alias \$out/lib/X11/fonts/misc/fonts.alias\"; ";