* gnu/packages/cups.scm (hplip): Add policykit support. [arguments](configure-flags): Add "--enable-dbus-build", "--enable-policykit". [arguments](make-flags): Add "policykit_dbus_etcdir", "policykit_dir", "policykit_dbus_sharedir". (inputs): Add "polkit". --- gnu/packages/cups.scm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index d264d6b12..ae975504b 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -40,6 +40,7 @@ #:use-module (gnu packages pdf) #:use-module (gnu packages pkg-config) #:use-module (gnu packages tls) + #:use-module (gnu packages polkit) #:use-module (gnu packages qt)) ;; Delay to avoid module circularity problems. @@ -351,8 +352,9 @@ device-specific programs to convert and print many types of files.") "--enable-gui-build" "--disable-qt4" "--enable-qt5" + "--enable-dbus-build" + "--enable-policykit" ;; TODO add foomatic drv install eventually. - ;; TODO --enable-policykit eventually. ,(string-append "--with-cupsfilterdir=" (assoc-ref %outputs "out") "/lib/cups/filter") ,(string-append "--with-cupsbackenddir=" @@ -362,6 +364,19 @@ device-specific programs to convert and print many types of files.") ,(string-append "--with-systraydir=" (assoc-ref %outputs "out") "/etc/xdg")) + #:make-flags + ;; Already set in 'fix-hard-coded-file-names phase: + ;; "rulesdir" and "halpredir". + `(,(string-append "policykit_dbus_etcdir=" + (assoc-ref %outputs "out") + "/etc/dbus-1/system.d") + ,(string-append "policykit_dir=" + (assoc-ref %outputs "out") + "/share/polkit-1/actions") + ,(string-append "policykit_dbus_sharedir=" + (assoc-ref %outputs "out") + "/share/dbus-1/system-services")) + #:imported-modules ((guix build python-build-system) ,@%gnu-build-system-modules) #:modules ((guix build gnu-build-system) @@ -429,5 +444,6 @@ device-specific programs to convert and print many types of files.") ("python-pygobject" ,python-pygobject) ("python-sip" ,python-sip) ;; TODO: Make hp-setup find python-dbus. - ("python-dbus" ,python-dbus))) + ("python-dbus" ,python-dbus) + ("polkit" ,polkit))) (native-inputs `(("pkg-config" ,pkg-config))))) -- 2.11.0