From 1e4e0c18b8f018cedc26c09b7b770ea24c8c7fc0 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 15 Jul 2012 23:03:23 -0400 Subject: [PATCH] xf86-input-wacom: Update to 0.16.0 --- pkgs/os-specific/linux/xf86-input-wacom/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 98446c70867..e043b12e820 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl , file, inputproto, libX11, libXext, libXi, libXrandr, libXrender -, ncurses, pkgconfig, randrproto, xorgserver, xproto, udev }: +, ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }: stdenv.mkDerivation rec { - name = "xf86-input-wacom-0.11.1"; + name = "xf86-input-wacom-0.16.0"; src = fetchurl { url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2"; - sha256 = "1jmnrkf89a3jjbpn17gyndlv9lqc0n7qwyi22hraxypq213gjclx"; + sha256 = "0sc0hmbs3l3ad68iwglbwjv9lg1vd333n1lv72j4nqmk7g57yrii"; }; buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender - ncurses pkgconfig randrproto xorgserver xproto udev ]; + ncurses pkgconfig randrproto xorgserver xproto udev libXinerama pixman ]; preConfigure = '' mkdir -p $out/share/X11/xorg.conf.d @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { --with-sdkdir=$out/include/xorg --with-xorg-conf-dir=$out/share/X11/xorg.conf.d" ''; + CFLAGS = "-I${pixman}/include/pixman-1"; + meta = with stdenv.lib; { maintainers = [ maintainers.goibhniu maintainers.urkud ]; description = "Wacom digitizer driver for X11";