nixpkgs/pkgs/servers/x11/xorg/overrides.nix
Michael Raskin 4fb36441e2 Override xf86videoati version and make xkbcomp work from inside X server
svn path=/nixpkgs/trunk/; revision=15450
2009-05-05 12:38:04 +00:00

72 lines
2 KiB
Nix

{args, xorg}:
{
fontmiscmisc = attrs: attrs // {
postInstall =
''
ln -s ${xorg.fontalias}/lib/X11/fonts/misc/fonts.alias $out/lib/X11/fonts/misc/fonts.alias
'';
};
imake = attrs: attrs // {
inherit (xorg) xorgcffiles;
x11BuildHook = ./imake.sh;
patches = [./imake.patch];
};
mkfontdir = attrs: attrs // {
preBuild = "substituteInPlace mkfontdir.cpp --replace BINDIR ${xorg.mkfontscale}/bin";
};
libXpm = attrs: attrs // {
patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in";
};
setxkbmap = attrs: attrs // {
postInstall =
''
ensureDir $out/share
ln -sfn ${args.xkeyboard_config}/etc/X11 $out/share/X11
'';
};
xf86inputevdev = attrs: attrs // {
configureFlags = "--with-sdkdir=\${out}/include/xorg";
preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c";
buildInputs = attrs.buildInputs ++ [xorg.kbproto xorg.libxkbfile xorg.randrproto];
};
xf86videointel = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
};
xf86videosis = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
};
xf86videoati = attrs: attrs // {
buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa];
src = args.fetchurl {
url = ftp://ftp.x.org/pub/individual/driver/xf86-video-ati-6.12.2.tar.bz2;
sha256 = "0l17mv7ljw9cnvfblms62vnjkpd26gf5dqgdpfzvkxqrfyhvpvhv";
};
};
xkbcomp = attrs: attrs // {
NIX_CFLAGS_COMPILE = "-DDFLT_XKB_CONFIG_ROOT=\".\"";
};
xorgserver = attrs: attrs // {
patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch];
buildInputs = attrs.buildInputs ++ [args.zlib xorg.xf86bigfontproto];
propagatedBuildInputs = [xorg.libpciaccess];
/*
configureFlags = "--with-xkb-output=/var/tmp";
postPatch = ''
sed -i -e 's@ -w @ -I${args.xkeyboard_config}/etc/X11/xkb -w @' xkb/ddxLoad.c
'';
*/
};
}