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

* Fixed the Wacom package (version 0.8.4 has disappeared).

Browse Source 
svn path=/nixpkgs/trunk/; revision=17003
This commit is contained in:
Eelco Dolstra 2009-09-10 12:21:25 +00:00
parent 5b7f46ea43
commit 580096378b
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/misc/linuxwacom/default.nix
View File

@ -1,18 +1,15 @@
{stdenv, fetchurl, libX11, libXi, { stdenv, fetchurl, libX11, libXi, inputproto
inputproto, xproto, ncurses, pkgconfig, , xproto, ncurses, pkgconfig, xorgserver }:
xorgserver,
udevSupport ? false}:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "linuxwacom-0.8.4"; name = "linuxwacom-0.8.4-1";
src = fetchurl { src = fetchurl {
url = "http://prdownloads.sourceforge.net/linuxwacom/linuxwacom-0.8.4.tar.bz2"; url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2";
sha256 = "1g1myn9wmczavkkb9jjfqq87la3n94nnwjm7w7yyyxsrdw4bavp5"; sha256 = "1gfsjm9i1c8d0w0g8v9q3xfrpxsmmsc9qlidr5mkwidr070cphz9";
}; };
buildInputs = [libX11 libXi inputproto buildInputs = [ libX11 libXi inputproto xproto ncurses pkgconfig xorgserver ];
xproto ncurses pkgconfig xorgserver];
preConfigure = '' preConfigure = ''
./configure --enable-wacomdrv --prefix=$out \ ./configure --enable-wacomdrv --prefix=$out \
@ -21,11 +18,10 @@ stdenv.mkDerivation {
mv configure configure.removed mv configure configure.removed
''; '';
postInstall = '' postInstall =
if test -n "${toString udevSupport}"; then ''
ensureDir $out/etc/udev/rules.d ensureDir $out/etc/udev/rules.d
cp ${./10-wacom.rules} $out/etc/udev/rules.d/10-wacom.rules cp ${./10-wacom.rules} $out/etc/udev/rules.d/10-wacom.rules
fi
''; '';
meta = { meta = {

3
pkgs/top-level/all-packages.nix
View File

@ -7978,8 +7978,7 @@ let
linuxwacom = import ../misc/linuxwacom { linuxwacom = import ../misc/linuxwacom {
inherit fetchurl stdenv ncurses pkgconfig; inherit fetchurl stdenv ncurses pkgconfig;
inherit (xorg) libX11 libXi xproto inputproto inherit (xorg) libX11 libXi xproto inputproto xorgserver;
xorgserver;
}; };
martyr = import ../development/libraries/martyr { martyr = import ../development/libraries/martyr {