* Update system-config-printer to 1.3.4.

svn path=/nixpkgs/branches/kde-4.7/; revision=27896
This commit is contained in:
Eelco Dolstra 2011-07-21 22:18:41 +00:00
parent 5a03576cb4
commit f9320cb33a
3 changed files with 26 additions and 14 deletions

View File

@ -1,27 +1,38 @@
{stdenv, fetchurl, udev, intltool, python, pkgconfig, glib, xmlto,
makeWrapper, pygobject, pygtk, docbook_xml_dtd_412, docbook_xsl,
pythonDBus, libxml2, desktop_file_utils, libusb, cups, pycups,
notify }:
{ stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto
, makeWrapper, pygobject, pygtk, docbook_xml_dtd_412, docbook_xsl
, pythonDBus, libxml2, desktop_file_utils, libusb, cups, pycups
, xz, pythonPackages
}:
stdenv.mkDerivation rec {
name = "${meta.name}-${meta.version}";
src = fetchurl {
url = "http://cyberelk.net/tim/data/${meta.name}/1.2/${name}.tar.bz2";
sha256 = "16xjvahmdkkix7281gx7ac9zqaxgfb7pjjlgcc6kmw52cifk86ww";
url = "http://cyberelk.net/tim/data/${meta.name}/1.3/${name}.tar.xz";
sha256 = "1d50rqgpyrzyrxwq3qhafzq9075qm2wxdrh1f1q7whlr0chxi3mw";
};
buildInputs = [ udev intltool python pkgconfig glib xmlto docbook_xml_dtd_412
libxml2 docbook_xsl desktop_file_utils libusb cups makeWrapper pygobject
pygtk pythonDBus pycups notify ];
buildInputs =
[ xz intltool pkgconfig glib udev libusb cups xmlto
libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils
pythonPackages.python pythonPackages.wrapPython
];
pythonPath = [ pythonDBus pycups pygtk pythonPackages.notify ];
configureFlags = "--with-udev-rules";
postInstall = ''
wrapProgram $out/bin/system-config-printer --set PYTHONPATH "$PYTHONPATH:$(toPythonPath $out):$(toPythonPath ${notify})/gtk-2.0"
'';
postInstall =
''
wrapPythonPrograms
( cd $out/share/system-config-printer/troubleshoot
mv .__init__.py-wrapped __init__.py
)
'';
meta = {
name = "system-config-printer";
version = "1.2.4";
version = "1.3.4";
};
}

View File

@ -1327,7 +1327,6 @@ let
svnfs = callPackage ../tools/filesystems/svnfs { };
system_config_printer = callPackage ../tools/misc/system-config-printer {
inherit (pythonPackages) notify;
libxml2 = libxml2Python;
};

View File

@ -910,6 +910,8 @@ let pythonPackages = python.modules // rec {
buildInputs = [ python pkgs.pkgconfig pkgs.libnotify pkgs.pygobject pkgs.pygtk pkgs.gtkLibs.glib pkgs.gtkLibs.gtk pkgs.dbus_glib ];
postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify .";
meta = {
description = "Python bindings for libnotify";
homepage = http://www.galago-project.org/;