From a9564ff90b3abe4d18225d535c82c824985aee94 Mon Sep 17 00:00:00 2001 From: Cillian de Roiste Date: Thu, 27 Jan 2011 21:19:10 +0000 Subject: [PATCH] Tidying up, adding license svn path=/nixpkgs/trunk/; revision=25707 --- .../linux/xf86-input-wacom/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index b7b89aa90ecc..45c4ce30f72e 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchurl, libX11, libXi, inputproto, file -, xproto, ncurses, pkgconfig, xorgserver, -libXext, libXrandr, randrproto, libXrender }: +{ stdenv, fetchurl, + file, inputproto, libX11, libXext, libXi, libXrandr, libXrender, + ncurses, pkgconfig, randrproto, xorgserver, xproto }: stdenv.mkDerivation rec { - name = "xf86-input-wacom-0.10.10"; + name = "xf86-input-wacom"; + version = "0.10.10"; src = fetchurl { - url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2"; + url = "mirror://sourceforge/linuxwacom/${name}-${version}.tar.bz2"; sha256 = "03yggp2ww64va6gmasl0gy0rbfcyb1zlj9kapp9kvhk2j4458fdr"; }; - buildInputs = [ libX11 libXi inputproto xproto ncurses pkgconfig xorgserver - file libXext libXrandr libXrender randrproto ]; + buildInputs = [ file inputproto libX11 libXext libXi libXrandr libXrender + ncurses pkgconfig randrproto xorgserver xproto ]; preConfigure = '' ensureDir $out/share/X11/xorg.conf.d @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.urkud ]; description = "Wacom digitizer driver for X11"; homepage = http://linuxwacom.sourceforge.net; + license = "GPLv2"; platforms = platforms.linux; # Probably, works with other unices as well }; }