From aaeac7d5d7b198e80da5474f20440fe4fe15fbdf Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sun, 29 Aug 2010 19:37:02 +0000 Subject: [PATCH] Upgrade to system-config-printer-1.2.4 TODO: make it work with udev (add helpers to udev PATH etc.) svn path=/nixpkgs/trunk/; revision=23520 --- .../misc/system-config-printer/default.nix | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 54f9bc57f0c5..4191ffd6f800 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,15 +1,20 @@ -{stdenv, fetchurl, perl, perlXMLParser, desktop_file_utils}: +{stdenv, fetchurl, udev, intltool, python, pkgconfig, glib, xmlto, + docbook_xml_dtd_412, docbook_xsl, libxml2, desktop_file_utils, libusb, cups}: + +stdenv.mkDerivation rec { + name = "${meta.name}-${meta.version}"; -stdenv.mkDerivation { - name = "system-config-printer-0.9.93"; src = fetchurl { - url = http://cyberelk.net/tim/data/system-config-printer/system-config-printer-0.9.93.tar.bz2; - md5 = "b97deae648bc1c5825874d250a9c140c"; + url = "http://cyberelk.net/tim/data/${meta.name}/1.2/${name}.tar.bz2"; + sha256 = "16xjvahmdkkix7281gx7ac9zqaxgfb7pjjlgcc6kmw52cifk86ww"; + }; + buildInputs = [ udev intltool python pkgconfig glib xmlto docbook_xml_dtd_412 + libxml2 docbook_xsl desktop_file_utils libusb cups]; + + configureFlags = "--with-udev-rules"; + + meta = { + name = "system-config-printer"; + version = "1.2.4"; }; - preConfigure = '' - sed -i -e "s/xmlto/echo xmlto/" Makefile.in # Disable building manual pages - echo > man/system-config-printer.1 - echo > man/system-config-printer-applet.1 - ''; - buildInputs = [ perl perlXMLParser desktop_file_utils ]; }