public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix a regression in setxkbmap: it couldn't find its rules anymore.

Browse Source 
svn path=/nixpkgs/trunk/; revision=9794
This commit is contained in:
Eelco Dolstra 2007-11-26 13:46:58 +00:00
parent 908e08e409
commit f64beb4b58
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/servers/x11/xorg/default.nix
View File

@ -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 {

2
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
View File

@ -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\"; ";