Fixed synaptics; Added GOCR (not that it is a good OCR); reverted MarcWeber's update to setup-new-2.sh (he has no time to use it in nearest future; later I hope it will be irrelevant)

svn path=/nixpkgs/trunk/; revision=9613
This commit is contained in:
Michael Raskin
2007-11-09 13:54:02 +00:00
parent ea1209571d
commit 43b208bbb9
8 changed files with 66 additions and 14 deletions
+9 -2
View File
@@ -7,9 +7,16 @@ stdenv.mkDerivation {
md5 = "1102cd575045640a064ab6f9b1e391af";
};
preBuild = "export NIX_CFLAGS_COMPILE=\"\${NIX_CFLAGS_COMPILE} -I${pixman}/include/pixman-1\"";
preBuild = "export NIX_CFLAGS_COMPILE=\"\${NIX_CFLAGS_COMPILE} -I${pixman}/include/pixman-1\";
sed -e '/local-[>]motion_history_proc/d; /local-[>]history_size/d;' -i synaptics.c
sed -e '/ALLINCLUDES = /iX_INCLUDES_ROOT = /homeless-shelter' -i Makefile
sed -e 's@^CFLAGS =.*@& -DDBG=//@' -i Makefile
sed -e 's/miPointerGetMotionBufferSize()/&,2/' -i synaptics.c
sed -e 's/miPointerGetMotionEvents/GetMotionHistory/' -i synaptics.c
sed -e 's/miPointerGetMotionBufferSize/GetMotionHistorySize/' -i synaptics.c
";
makeFlags="DESTDIR=\${out} PREFIX=/ ";
buildInputs = [libX11 pkgconfig xorgserver libXi libXext pixman];
buildInputs = [libX11 pkgconfig xorgserver libXi libXext pixman xf86inputevdev];
meta = {
description = "Driver for synaptics touchpad.";