diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2017-01-18 19:06:16 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-18 19:06:16 -0600 |
commit | 0baa434f2c13059b8845a30189a60d852a9c71e6 (patch) | |
tree | 126c785e64078e44c8e151379548b2ff8021273b | |
parent | 2b0ca8dc5d0244f619b78cf04ddc6f34a3355f30 (diff) | |
parent | 6a52a130debae70422f7dc16c808df634ac7f13b (diff) | |
download | nixpkgs-0baa434f2c13059b8845a30189a60d852a9c71e6.tar nixpkgs-0baa434f2c13059b8845a30189a60d852a9c71e6.tar.gz nixpkgs-0baa434f2c13059b8845a30189a60d852a9c71e6.tar.bz2 nixpkgs-0baa434f2c13059b8845a30189a60d852a9c71e6.tar.lz nixpkgs-0baa434f2c13059b8845a30189a60d852a9c71e6.tar.xz nixpkgs-0baa434f2c13059b8845a30189a60d852a9c71e6.tar.zst nixpkgs-0baa434f2c13059b8845a30189a60d852a9c71e6.zip |
Merge pull request #21977 from bjornfor/kde-printing
kde5: fix error message in "Add Printer" dialog
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/kde5.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/system-config-printer/default.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index de5bfe263d4..ee4ec0fc819 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -229,6 +229,8 @@ in # Enable helpful DBus services. services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; + services.dbus.packages = + mkIf config.services.printing.enable [ pkgs.system-config-printer ]; # Extra UDEV rules used by Solid services.udev.packages = [ diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index ab4a008fa09..fc4a24ec355 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { ]; pythonPath = with pythonPackages; - [ pycups pycurl dbus-python pygobject3 requests2 ]; + [ pycups pycurl dbus-python pygobject3 requests2 pycairo ]; configureFlags = [ "--with-udev-rules" |