public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xf86-input-wacom-0.11.1, fix name

Browse Source 
Also remove broken 10-wacom.rules

svn path=/nixpkgs/trunk/; revision=28657
This commit is contained in:
Yury G. Kudryashov 2011-08-18 12:52:57 +00:00
parent 0466e94091
commit 3df650fa23
2 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/os-specific/linux/xf86-input-wacom/10-wacom.rules
View File

@ -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"

23
pkgs/os-specific/linux/xf86-input-wacom/default.nix
View File

@ -1,18 +1,17 @@
{ stdenv, fetchurl, { stdenv, fetchurl
file, inputproto, libX11, libXext, libXi, libXrandr, libXrender, , file, inputproto, libX11, libXext, libXi, libXrandr, libXrender
ncurses, pkgconfig, randrproto, xorgserver, xproto }: , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xf86-input-wacom"; name = "xf86-input-wacom-0.11.1";
version = "0.10.10";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/linuxwacom/${name}-${version}.tar.bz2"; url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2";
sha256 = "03yggp2ww64va6gmasl0gy0rbfcyb1zlj9kapp9kvhk2j4458fdr"; sha256 = "1jmnrkf89a3jjbpn17gyndlv9lqc0n7qwyi22hraxypq213gjclx";
}; };
buildInputs = [ file inputproto libX11 libXext libXi libXrandr libXrender buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender
ncurses pkgconfig randrproto xorgserver xproto ]; ncurses pkgconfig randrproto xorgserver xproto udev ];
preConfigure = '' preConfigure = ''
ensureDir $out/share/X11/xorg.conf.d 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" --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; { meta = with stdenv.lib; {
maintainers = [ maintainers.goibhniu maintainers.urkud ]; maintainers = [ maintainers.goibhniu maintainers.urkud ];
description = "Wacom digitizer driver for X11"; description = "Wacom digitizer driver for X11";