summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorArie Middelkoop <amiddelk@gmail.com>2012-02-05 00:43:54 +0000
committerArie Middelkoop <amiddelk@gmail.com>2012-02-05 00:43:54 +0000
commitb4d5957ac4c8026589f2d4569c76a8709affbd81 (patch)
tree8e6e67a06e89602252ddf01757ceba1aa95792aa /pkgs/servers
parentd15738aca5632a6496f81797530ba5395e80d937 (diff)
downloadnixpkgs-b4d5957ac4c8026589f2d4569c76a8709affbd81.tar
nixpkgs-b4d5957ac4c8026589f2d4569c76a8709affbd81.tar.gz
nixpkgs-b4d5957ac4c8026589f2d4569c76a8709affbd81.tar.bz2
nixpkgs-b4d5957ac4c8026589f2d4569c76a8709affbd81.tar.lz
nixpkgs-b4d5957ac4c8026589f2d4569c76a8709affbd81.tar.xz
nixpkgs-b4d5957ac4c8026589f2d4569c76a8709affbd81.tar.zst
nixpkgs-b4d5957ac4c8026589f2d4569c76a8709affbd81.zip
Version bumb of 'xf86-synaptics' module, which fixes a cpu-stealing bug when using syndaemon.
svn path=/nixpkgs/trunk/; revision=32035
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/x11/xorg/default.nix6
-rw-r--r--pkgs/servers/x11/xorg/tarballs-7.6.list2
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 296dac46cba..4fbc6fbdfda 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1398,11 +1398,11 @@ let
   })) // {inherit inputproto xorgserver xproto ;};
     
   xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) {
-    name = "xf86-input-synaptics-1.3.0";
+    name = "xf86-input-synaptics-1.5.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.6/src/everything/xf86-input-synaptics-1.3.0.tar.bz2;
-      sha256 = "1mwgb85qjyzx2yfi7jhgvd435zdyqxyq9aqwlsldmlpkqi8358rh";
+      url = mirror://xorg/individual/driver/xf86-input-synaptics-1.5.0.tar.bz2;
+      sha256 = "0khwda8lrrvrdb37i4i1kdhg8f44kgcjq9y209ds7ja9zjcm7k4m";
     };
     buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ];
   })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.6.list b/pkgs/servers/x11/xorg/tarballs-7.6.list
index 27cd5ca5d82..613c3107c86 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.6.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.6.list
@@ -121,7 +121,7 @@ mirror://xorg/individual/driver/xf86-input-evdev-2.6.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-input-joystick-1.5.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-input-keyboard-1.5.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-input-mouse-1.6.0.tar.bz2
-mirror://xorg/X11R7.6/src/everything/xf86-input-synaptics-1.3.0.tar.bz2
+mirror://xorg/individual/driver/xf86-input-synaptics-1.5.0.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-input-vmmouse-12.6.10.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-input-void-1.3.1.tar.bz2
 mirror://xorg/X11R7.6/src/everything/xf86-video-apm-1.2.3.tar.bz2