Author: eelco
Date: Thu Jul 21 22:18:41 2011
New Revision: 27896
URL: https://svn.nixos.org/websvn/nix/?rev=27896&sc=1
Log:
* Update system-config-printer to 1.3.4.
Modified:
nixpkgs/branches/kde-4.7/pkgs/tools/misc/system-config-printer/default.nix
nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix
nixpkgs/branches/kde-4.7/pkgs/top-level/python-packages.nix
Modified:
nixpkgs/branches/kde-4.7/pkgs/tools/misc/system-config-printer/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/tools/misc/system-config-printer/default.nix
Thu Jul 21 22:02:01 2011 (r27895)
+++ nixpkgs/branches/kde-4.7/pkgs/tools/misc/system-config-printer/default.nix
Thu Jul 21 22:18:41 2011 (r27896)
@@ -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";
};
}
Modified: nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix Thu Jul 21
22:02:01 2011 (r27895)
+++ nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix Thu Jul 21
22:18:41 2011 (r27896)
@@ -1327,7 +1327,6 @@
svnfs = callPackage ../tools/filesystems/svnfs { };
system_config_printer = callPackage ../tools/misc/system-config-printer {
- inherit (pythonPackages) notify;
libxml2 = libxml2Python;
};
Modified: nixpkgs/branches/kde-4.7/pkgs/top-level/python-packages.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/top-level/python-packages.nix Thu Jul 21
22:02:01 2011 (r27895)
+++ nixpkgs/branches/kde-4.7/pkgs/top-level/python-packages.nix Thu Jul 21
22:18:41 2011 (r27896)
@@ -910,6 +910,8 @@
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/;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
