Commit Graph

29 Commits

Author SHA1 Message Date
Frederik Rietdijk
f83bb7d1ea Revert "Merge pull request #32024 from andir/unstable-fix-gnome3-printing"
This reverts commit 03207c067c, reversing
changes made to 822342ffdf.

Reverted because the change was not needed anymore:
https://github.com/NixOS/nixpkgs/pull/32024#issuecomment-346947664
2017-11-26 09:15:39 +01:00
Joerg Thalheim
3f1c4360a8 system-config-printer: fix python path
propagated dependencies were not added to PYTHONPATH
2017-11-25 12:24:23 +01:00
Frederik Rietdijk
9544383744 system-config-printer: recurse into python dependencies
pythonPath is used to create the eventual wrappers. It does not recurse
into the Python dependencies, which means e.g. requests doesn't haven
its dependencies.
2017-11-23 15:11:02 +01:00
Symphorien Gibol
dba8058f9d system-config-printer: add (optional) dependency pysmbc
Use case:
https://askubuntu.com/questions/548361/browse-button-disabled-in-windows-printer-via-samba-for-printer-shares
2017-09-29 21:16:42 +02:00
Robin Gloster
c438fe5a16
system-config-printer: fix wrapProgram call 2017-08-10 15:15:44 +02:00
Frederik Rietdijk
ef4442e827 Python: replace requests2 with requests tree-wide
See f63eb58573

The `requests2` attribute now throws an error informing that `requests`
should be used instead.
2017-05-07 12:56:09 +02:00
Nikolay Amiantov
5565728670 system-config-printer: 1.5.7 -> 1.5.9
Use gappsWrapHook.
2017-04-23 17:08:56 +03:00
Eelco Dolstra
5897aa771c
system-config-printer: Remove -dev paths from closure
Workaround for #24128.
2017-03-20 17:31:26 +01:00
Eelco Dolstra
6dd5846f1b
system-config-printer: Strip binaries in $out/etc
This reduces its closure size from 484 to 281 MiB.
2017-03-20 17:31:19 +01:00
Bjørn Forsman
19dc19690b system-config-printer: add missing dependency 'pycairo'
Noticed when running on KDE (in contrast with GNOME, which probably
pulls in pycairo via some impurity).
2017-01-18 20:39:13 +01:00
Bjørn Forsman
90de10b3ee system-config-printer: fix "Print Test Page"
Wrap s-c-p with CUPS_DATADIR=${cups-filters}/share/cups so that it finds
the "testprint" file needed for "Print Test Page" functionality.

Without this change, s-c-p tries to open /usr/share/cups/data/testprint
(fails).
2016-08-26 21:11:36 +02:00
Bjørn Forsman
8f6a8f0757 system-config-printer: fix expansion of $(out) in .service file
Allows the configure-printer@.service to find the udev-configure-printer
program (correct ExecStart path).
2016-08-25 17:37:50 +02:00
Frederik Rietdijk
5a501bd828 Remove top-level dbus_python and pythonDBus.
See #11567.

Furthermore, it renames pythonPackages.dbus to pythonPackages.dbus-
python as that's the name upstream uses.

There is a small rebuild but I couldn't figure out the actual cause.
2016-08-16 22:52:37 +02:00
Bjørn Forsman
1f4853f7a9 system-config-printer: update hash to really upgrade to 1.5.7
Commit 03353ce6ff ("system-config-printer: 1.3.12 -> 1 5.7")
forgot to update the hash. So since that commit we actually continued to
use the old version (1.3.12) because of the NixOS tarball cache...

The new version prints some warnings on startup:

  /nix/store/HASH-system-config-printer-1.5.7/share/system-config-printer/system-config-printer.py:32: \
    PyGIWarning: Polkit was imported without specifying a version first. \
    Use gi.require_version('Polkit', '1.0') before import to ensure that the right version gets loaded.
  from gi.repository import Polkit

...and similar errors for GdkPixbuf, Gdk, Gtk and Notify. These warnings
are already fixed upstream and will be part of the next release.

Implementation details:
* The new version needs python3.
* Remove unneeded, and python3 incompatible, 'notify' dependency.
  system-config-printer > 1.3.12 replaced it with GOBject introspection
  bindings to libnotify (from gi.repository import Notify).
* Add gtk3, gdk_pixbuf, pango, atk, libnotify as needed (for gobject
  introspection).
* A new --with-udevdir configure option is used to prevent the
  installer from trying to install stuff to "/rules.d" (yes, the root).
* Get pycups from the passed pythonPackages set (fixes loading of
  python cups module).
* Use pygobject3 instead of pygobject, as needed.
* Use dbus from the passed pythonPackages attrset instead of
  pythonDBus, so we get a python3 compatible module that loads
  successfully.
* Python requests2 modules is required.
2016-06-28 14:23:49 +02:00
Bjørn Forsman
b741df943f system-config-printer: unbreak dbus service (again)
The service file refers to /usr/bin/... instead of a Nix store path.
Fix it.

The original fix was wrongly removed in commit 03353ce6ff
("system-config-printer: 1.3.12 -> 1 5.7"). We can remove this fixup on
the _next_ upstream release.
2016-06-18 17:07:28 +02:00
Nikolay Amiantov
03353ce6ff system-config-printer: 1.3.12 -> 1 5.7 2016-01-17 15:50:40 +03:00
Bjørn Forsman
d1cb42f297 system-config-printer: set meta.platforms 2016-01-04 14:21:43 +01:00
Bjørn Forsman
1979034956 system-config-printer: remove bad /usr/bin reference in dbus service file 2016-01-02 22:04:52 +01:00
Vladimír Čunát
d6349df0dd put systemd unit dirs on the right place
Also see #1936.
2014-03-13 21:44:51 +01:00
Karn Kallio
90909ea936 system-config-printer patch
The latest version of system-config-printer seems to have introduced a
dependency on pycurl.  The attached patch includes this, fixing the build of
kde, which depended on it through kdeadmin.
2013-01-24 23:03:39 -05:00
Eelco Dolstra
8beea55869 system-config-printer: Update to 1.3.12
Fixes building against systemd.

http://hydra.nixos.org/build/3469842
2012-12-12 16:34:38 +01:00
Eelco Dolstra
d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +00:00
Eelco Dolstra
9379248ef3 * Update kdeadmin and kdegames.
svn path=/nixpkgs/branches/kde-4.7/; revision=27898
2011-07-22 01:28:09 +00:00
Eelco Dolstra
a75f9edd10 svn path=/nixpkgs/branches/kde-4.7/; revision=27897 2011-07-21 22:18:52 +00:00
Eelco Dolstra
f9320cb33a * Update system-config-printer to 1.3.4.
svn path=/nixpkgs/branches/kde-4.7/; revision=27896
2011-07-21 22:18:41 +00:00
Evgeny Egorochkin
b89f2ef1e4 system-config-printer: fix runtime errors. Patch by Karn Kallio.
svn path=/nixpkgs/trunk/; revision=24899
2010-11-28 09:46:51 +00:00
Yury G. Kudryashov
aaeac7d5d7 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
2010-08-29 19:37:02 +00:00
Eelco Dolstra
67b32b0ec7 * system-config-printer: don't apply autoconf/automake, because then
we need to have exactly the right versions of those :-)

svn path=/nixpkgs/branches/stdenv-updates/; revision=15183
2009-04-20 14:10:15 +00:00
Sander van der Burg
3a1c208a69 Added pycups,desktop_file_utils,system_config_printer packages and added python kdebindings closure
svn path=/nixpkgs/trunk/; revision=14246
2009-02-25 16:05:13 +00:00