diff --git a/pkgs/os-specific/linux/xf86-input-wacom/10-wacom.rules b/pkgs/os-specific/linux/xf86-input-wacom/10-wacom.rules deleted file mode 100644 index 260788c4538d..000000000000 --- a/pkgs/os-specific/linux/xf86-input-wacom/10-wacom.rules +++ /dev/null @@ -1,16 +0,0 @@ -# From http://linuxwacom.sourceforge.net/index.php/howto/newwacom -# udev rules for wacom tablets. - -KERNEL!="event[0-9]*", GOTO="wacom_end" -# Multiple interface support for stylus and touch devices. -DRIVERS=="wacom", ATTRS{bInterfaceNumber}=="00", ENV{WACOM_TYPE}="stylus" -DRIVERS=="wacom", ATTRS{bInterfaceNumber}=="01", ENV{WACOM_TYPE}="touch" -# Convenience links for the common case of a single tablet. We could do just this: -#ATTRS{idVendor}=="056a", SYMLINK+="input/wacom-$env{WACOM_TYPE}" -# but for legacy reasons, we keep the input/wacom link as the generic stylus device. -ATTRS{idVendor}=="056a", ENV{WACOM_TYPE}!="touch", SYMLINK+="input/wacom" -ATTRS{idVendor}=="056a", ENV{WACOM_TYPE}=="touch", SYMLINK+="input/wacom-touch" -# Check and repossess the device if a module other than the wacom one -# is already bound to it. -ATTRS{idVendor}=="056a", ACTION=="add", RUN+="check_driver wacom $devpath $env{ID_BUS}" -LABEL="wacom_end" diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 1102b2ebe40a..9cc25174c51f 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchurl, - file, inputproto, libX11, libXext, libXi, libXrandr, libXrender, - ncurses, pkgconfig, randrproto, xorgserver, xproto }: +{ stdenv, fetchurl +, file, inputproto, libX11, libXext, libXi, libXrandr, libXrender +, ncurses, pkgconfig, randrproto, xorgserver, xproto, udev }: stdenv.mkDerivation rec { - name = "xf86-input-wacom"; - version = "0.10.10"; + name = "xf86-input-wacom-0.11.1"; src = fetchurl { - url = "mirror://sourceforge/linuxwacom/${name}-${version}.tar.bz2"; - sha256 = "03yggp2ww64va6gmasl0gy0rbfcyb1zlj9kapp9kvhk2j4458fdr"; + url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2"; + sha256 = "1jmnrkf89a3jjbpn17gyndlv9lqc0n7qwyi22hraxypq213gjclx"; }; - buildInputs = [ file inputproto libX11 libXext libXi libXrandr libXrender - ncurses pkgconfig randrproto xorgserver xproto ]; + buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender + ncurses pkgconfig randrproto xorgserver xproto udev ]; preConfigure = '' ensureDir $out/share/X11/xorg.conf.d @@ -20,12 +19,6 @@ stdenv.mkDerivation rec { --with-sdkdir=$out/include/xorg --with-xorg-conf-dir=$out/share/X11/xorg.conf.d" ''; - postInstall = - '' - ensureDir $out/lib/udev/rules.d - cp ${./10-wacom.rules} $out/lib/udev/rules.d/10-wacom.rules - ''; - meta = with stdenv.lib; { maintainers = [ maintainers.goibhniu maintainers.urkud ]; description = "Wacom digitizer driver for X11";