aboutsummaryrefslogtreecommitdiff
path: root/pkgs/misc/cups
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-09-15 23:24:50 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2019-09-16 13:59:09 -0400
commit8e69437fee3cdb4972b93e09e52078132aae0d4b (patch)
tree5d15358ba18f34f23f9669f28449320cde6228bf /pkgs/misc/cups
parent271c4b16e94f219b388bd0cc0ddb007836cb62de (diff)
cups-pk-helper: Move D-Bus conf file to share/dbus-1/system.d
Since D-Bus 1.9.18 configuration files installed by third-party should go in share/dbus-1/system.d. The old location is for sysadmin overrides.
Diffstat (limited to 'pkgs/misc/cups')
-rw-r--r--pkgs/misc/cups/cups-pk-helper.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/pkgs/misc/cups/cups-pk-helper.nix
index 5e7596032b3d..6534d300e824 100644
--- a/pkgs/misc/cups/cups-pk-helper.nix
+++ b/pkgs/misc/cups/cups-pk-helper.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkgconfig, glib, polkit, cups }:
+{ stdenv, fetchurl, intltool, pkgconfig, glib, polkit, cups, fetchpatch }:
stdenv.mkDerivation rec {
version = "0.2.6";
@@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ glib polkit cups ];
+ patches = [
+ # Don't use etc/dbus-1/system.d
+ (fetchpatch {
+ url = "https://gitlab.freedesktop.org/cups-pk-helper/cups-pk-helper/merge_requests/2.patch";
+ sha256 = "1kamhr5kn8c1y0q8xbip0fgr7maf3dyddlvab4n0iypk7rwwikl0";
+ })
+ ];
+
meta = with stdenv.lib; {
description = "PolicyKit helper to configure cups with fine-grained privileges";
homepage = http://www.freedesktop.org/wiki/Software/cups-pk-helper/;