diff options
| author | Christopher Baines <mail@cbaines.net> | 2021-02-03 09:14:43 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2021-02-03 09:57:35 +0000 |
| commit | e740cc614096e768813280c718f9e96343ba41b3 (patch) | |
| tree | 25ade70a5d408be80f62f19c6511172aab7dcce5 /gnu/services/cups.scm | |
| parent | 1b9186828867e77af1f2ee6741063424f8256398 (diff) | |
| parent | 63cf277bfacf282d2b19f00553745b2a9370eca0 (diff) | |
| download | guix-patches-e740cc614096e768813280c718f9e96343ba41b3.tar guix-patches-e740cc614096e768813280c718f9e96343ba41b3.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/services/cups.scm')
| -rw-r--r-- | gnu/services/cups.scm | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/gnu/services/cups.scm b/gnu/services/cups.scm index e8957c6859..17ed04e58b 100644 --- a/gnu/services/cups.scm +++ b/gnu/services/cups.scm @@ -32,7 +32,7 @@ #:use-module (guix records) #:use-module (guix gexp) #:use-module (ice-9 match) - #:use-module ((srfi srfi-1) #:select (append-map)) + #:use-module ((srfi srfi-1) #:select (append-map find)) #:export (cups-service-type cups-configuration opaque-cups-configuration @@ -50,7 +50,13 @@ ;;; Code: (define %cups-accounts - (list (user-group (name "lp") (system? #t)) + (list (or + ;; The "lp" group should already exist; try to reuse it. + (find (lambda (group) + (and (user-group? group) + (string=? (user-group-name group) "lp"))) + %base-groups) + (user-group (name "lp") (system? #t))) (user-group (name "lpadmin") (system? #t)) (user-account (name "lp") @@ -482,7 +488,7 @@ programs.") (package cups) "The CUPS package.") (extensions - (package-list (list cups-filters epson-inkjet-printer-escpr + (package-list (list brlaser cups-filters epson-inkjet-printer-escpr foomatic-filters hplip-minimal splix)) "Drivers and other extensions to the CUPS package.") (files-configuration |