02/03: gnu: cups-filters: Remove input labels.

[guix-commits]

nckx pushed a commit to branch core-updates
in repository guix.

commit 0463150402f1395736224824431062944f0fe77f
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Mon Jan 10 19:51:02 2022 +0100

    gnu: cups-filters: Remove input labels.
    
    * gnu/packages/cups.scm (cups-filters)[inputs]: Remove input labels.
    [arguments]: Adjust accordingly.
---
 gnu/packages/cups.scm | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 659da2d0e5..ace7527590 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -177,7 +177,7 @@ driver is known to work with these printers:
                                   #$(this-package-input "font-dejavu")
                                   "/share/fonts/truetype/DejaVuSans.ttf")
                    (string-append "--with-gs-path="
-                                  #$(this-package-input "ghostscript")
+                                  #$(this-package-input 
"ghostscript-with-cups")
                                   "/bin/gsc")
                    (string-append "--with-shell="
                                   (assoc-ref %build-inputs "bash")
@@ -203,30 +203,31 @@ driver is known to work with these printers:
                       (wrap-program file
                         `("PATH" ":" prefix
                           (,(string-append
-                             #$(this-package-input "ghostscript") "/bin:"
+                             #$(this-package-input "ghostscript-with-cups")
+                             "/bin:"
                              #$(this-package-input "grep") "/bin")))))
                     (find-files (string-append #$output
                                                "/lib/cups/filter"))))))))
     (native-inputs
-     (list `(,glib "bin") ; for gdbus-codegen
+     (list `(,glib "bin")               ; for gdbus-codegen
            pkg-config))
     (inputs
-     `(("avahi"        ,avahi)
-       ("fontconfig"   ,fontconfig)
-       ("freetype"     ,freetype)
-       ("font-dejavu"  ,font-dejavu)    ; also needed by test suite
-       ("ghostscript"  ,ghostscript/cups)
-       ("grep"         ,grep)
-       ("ijs"          ,ijs)
-       ("dbus"         ,dbus)
-       ("lcms"         ,lcms)
-       ("libjpeg"      ,libjpeg-turbo)
-       ("libpng"       ,libpng)
-       ("libtiff"      ,libtiff)
-       ("glib"         ,glib)
-       ("qpdf"         ,qpdf)
-       ("poppler"      ,poppler)
-       ("cups-minimal" ,cups-minimal)))
+     (list avahi
+           fontconfig
+           freetype
+           font-dejavu                  ; also needed by test suite
+           ghostscript/cups
+           grep
+           ijs
+           dbus
+           lcms
+           libjpeg-turbo
+           libpng
+           libtiff
+           glib
+           qpdf
+           poppler
+           cups-minimal))
     (home-page "https://wiki.linuxfoundation.org/openprinting/cups-filters";)
     (synopsis "OpenPrinting CUPS filters and backends")
     (description