3
0
Fork 0
forked from mirrors/nixpkgs

system-config-printer: Update to 1.3.12

Fixes building against systemd.

http://hydra.nixos.org/build/3469842
This commit is contained in:
Eelco Dolstra 2012-12-12 16:34:38 +01:00
parent 6a0288d14b
commit 8beea55869

View file

@ -1,20 +1,20 @@
{ stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto { stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto
, makeWrapper, pygobject, pygtk, docbook_xml_dtd_412, docbook_xsl , makeWrapper, pygobject, pygtk, docbook_xml_dtd_412, docbook_xsl
, pythonDBus, libxml2, desktop_file_utils, libusb, cups, pycups , pythonDBus, libxml2, desktop_file_utils, libusb1, cups, pycups
, pythonPackages , pythonPackages
, withGUI ? true , withGUI ? true
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${meta.name}-${meta.version}"; name = "system-config-printer-1.3.12";
src = fetchurl { src = fetchurl {
url = "http://cyberelk.net/tim/data/${meta.name}/1.3/${name}.tar.xz"; url = "http://cyberelk.net/tim/data/system-config-printer/1.3/${name}.tar.xz";
sha256 = "1d50rqgpyrzyrxwq3qhafzq9075qm2wxdrh1f1q7whlr0chxi3mw"; sha256 = "1cg9n75rg5l9vr1925n2g771kga33imikyl0mf70lww2sfgvs18r";
}; };
buildInputs = buildInputs =
[ intltool pkgconfig glib udev libusb cups xmlto [ intltool pkgconfig glib udev libusb1 cups xmlto
libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils
pythonPackages.python pythonPackages.wrapPython pythonPackages.python pythonPackages.wrapPython
]; ];
@ -22,8 +22,11 @@ stdenv.mkDerivation rec {
pythonPath = pythonPath =
[ pythonDBus pycups pygobject ] [ pythonDBus pycups pygobject ]
++ stdenv.lib.optionals withGUI [ pygtk pythonPackages.notify ]; ++ stdenv.lib.optionals withGUI [ pygtk pythonPackages.notify ];
configureFlags = "--with-udev-rules"; configureFlags =
[ "--with-udev-rules"
"--with-systemdsystemunitdir=$(out)/etc/systemd/systemd"
];
postInstall = postInstall =
'' ''
@ -34,7 +37,6 @@ stdenv.mkDerivation rec {
''; '';
meta = { meta = {
name = "system-config-printer"; homepage = http://cyberelk.net/tim/software/system-config-printer/;
version = "1.3.4";
}; };
} }