alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* setxkbmap: add a symlink to xkeyboard-config so that it can find the

Browse source 
rules files.  Maybe this should be done through an environment variable.

svn path=/nixpkgs/trunk/; revision=8496
This commit is contained in:
Eelco Dolstra 2007-03-29 23:02:07 +00:00
parent e3d318da8b
commit c214c7525d
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,7 @@
# This is a generated file. Do not edit! # This is a generated file. Do not edit!
{ stdenv, fetchurl, pkgconfig, freetype, fontconfig { stdenv, fetchurl, pkgconfig, freetype, fontconfig
, libxslt, expat, libdrm, libpng, zlib, perl, mesa, mesaHeaders , libxslt, expat, libdrm, libpng, zlib, perl, mesa, mesaHeaders
, xkeyboard_config
}: }:
rec { rec {
@ -1274,6 +1275,7 @@ rec {
sha256 = "19jxlksl90i674yad1n7w42s3nv0hhlkwczya2lnavpl0570jr34"; sha256 = "19jxlksl90i674yad1n7w42s3nv0hhlkwczya2lnavpl0570jr34";
}; };
buildInputs = [pkgconfig libX11 libxkbfile ]; buildInputs = [pkgconfig libX11 libxkbfile ];
postInstall = "ln -sfn ${xkeyboard_config}/etc $out/share";
}) // {inherit libX11 libxkbfile ;}; }) // {inherit libX11 libxkbfile ;};
showfont = (stdenv.mkDerivation { showfont = (stdenv.mkDerivation {

3
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
View file

@ -44,6 +44,8 @@ $extraAttrs{"xorgserver"} = " mesaSrc = mesa.src; x11BuildHook = ./xorgserver.sh
$extraAttrs{"imake"} = " inherit xorgcffiles; x11BuildHook = ./imake.sh; patches = [./imake.patch]; "; $extraAttrs{"imake"} = " inherit xorgcffiles; x11BuildHook = ./imake.sh; patches = [./imake.patch]; ";
$extraAttrs{"setxkbmap"} = " postInstall = \"ln -sfn ${xkeyboard_config}/etc $out/share\"; ";
# Used to avoid the following assertion error: # Used to avoid the following assertion error:
# java: xcb_xlib.c:50: xcb_xlib_unlock: Assertion `c->xlib.lock' failed. # java: xcb_xlib.c:50: xcb_xlib_unlock: Assertion `c->xlib.lock' failed.
$extraAttrs{"libxcb"} = " patches = [./xcb_xlib-no-assert-on-lock.patch]; "; $extraAttrs{"libxcb"} = " patches = [./xcb_xlib-no-assert-on-lock.patch]; ";
@ -201,6 +203,7 @@ print OUT <<EOF;
# This is a generated file. Do not edit! # This is a generated file. Do not edit!
{ stdenv, fetchurl, pkgconfig, freetype, fontconfig { stdenv, fetchurl, pkgconfig, freetype, fontconfig
, libxslt, expat, libdrm, libpng, zlib, perl, mesa, mesaHeaders , libxslt, expat, libdrm, libpng, zlib, perl, mesa, mesaHeaders
, xkeyboard_config
}: }:
rec { rec {

3
pkgs/top-level/all-packages.nix
View file

@ -2147,7 +2147,8 @@ rec {
xorg = recurseIntoAttrs (import ../servers/x11/xorg { xorg = recurseIntoAttrs (import ../servers/x11/xorg {
inherit fetchurl stdenv pkgconfig freetype fontconfig inherit fetchurl stdenv pkgconfig freetype fontconfig
libxslt expat libdrm libpng zlib perl mesa mesaHeaders; libxslt expat libdrm libpng zlib perl mesa mesaHeaders
xkeyboard_config;
}); });