summary refs log tree commit diff
path: root/pkgs/misc/synaptics
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2007-11-09 13:54:02 +0000
committerMichael Raskin <7c6f434c@mail.ru>2007-11-09 13:54:02 +0000
commit43b208bbb94b8ebe7527aed928b7681ee6590b96 (patch)
tree0920dae39778b0c118098e7bd4d7e56c868f2d19 /pkgs/misc/synaptics
parentea1209571de0ca0ec10446826c565c70f1e90943 (diff)
downloadnixpkgs-43b208bbb94b8ebe7527aed928b7681ee6590b96.tar
nixpkgs-43b208bbb94b8ebe7527aed928b7681ee6590b96.tar.gz
nixpkgs-43b208bbb94b8ebe7527aed928b7681ee6590b96.tar.bz2
nixpkgs-43b208bbb94b8ebe7527aed928b7681ee6590b96.tar.lz
nixpkgs-43b208bbb94b8ebe7527aed928b7681ee6590b96.tar.xz
nixpkgs-43b208bbb94b8ebe7527aed928b7681ee6590b96.tar.zst
nixpkgs-43b208bbb94b8ebe7527aed928b7681ee6590b96.zip
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
Diffstat (limited to 'pkgs/misc/synaptics')
-rw-r--r--pkgs/misc/synaptics/default.nix11
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/misc/synaptics/default.nix b/pkgs/misc/synaptics/default.nix
index 66555e69671..c809046130d 100644
--- a/pkgs/misc/synaptics/default.nix
+++ b/pkgs/misc/synaptics/default.nix
@@ -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.";