ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 06:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: cups: Inherit & modify cups-minimal arguments.

Browse source 
* gnu/packages/cups.scm (cups)[arguments]: Use
substitute-keyword-arguments on cups-minimal's arguments to do away
with the redundant 'patch-makedefs and 'make-manpages-writable phases.
This commit is contained in:
Tobias Geerinckx-Rice 2021-06-22 16:56:19 +02:00
parent 7931883bcc
commit 8d9a2dee1f
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 106 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
gnu/packages/cups.scm
View file

@ -319,23 +319,19 @@ (define-public cups
(package/inherit cups-minimal
(name "cups")
(arguments
`(;; Three tests fail:
(substitute-keyword-arguments (package-arguments cups-minimal)
((#:tests? _ #t)
;; Three tests fail:
;; * two tests in ipp-1.1.test related to "RFC 2911 section 3.2.6:
;; Get-Jobs Operation"
;; * test of number of error/warning messages, probably related to a
;; missing font.
#:tests? #f
#:configure-flags
'("--disable-launchd"
"--disable-systemd")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'patch-makedefs
(lambda _
(substitute* "Makedefs.in"
(("INITDIR.*=.*@INITDIR@") "INITDIR = @prefix@/@INITDIR@")
(("/bin/sh") (which "sh")))
#t))
#f)
((#:configure-flags _ '())
`(list "--disable-launchd"
"--disable-systemd"))
((#:phases phases '%standard-phases)
`(modify-phases ,phases
(add-before 'check 'patch-tests
(lambda _
(let ((filters (assoc-ref %build-inputs "cups-filters"))
@ -346,19 +342,19 @@ (define-public cups
(substitute* "test/run-stp-tests.sh"
((" *BASE=/tmp/") (string-append "BASE=" testdir))
;; allow installation of filters from output dir and from
;; cups-filters
;; Allow installation of filters from the output directory
;; and from cups-filters.
(("for dir in /usr/libexec/cups/filter /usr/lib/cups/filter")
(string-append
"for dir in "
(assoc-ref %outputs "out") "/lib/cups/filter "
filters "/lib/cups/filter"))
;; check for charsets in cups-filters output
;; Check for charsets in the default cups-filters output.
(("/usr/share/cups/charsets")
(string-append filters "/share/cups/charsets"))
;; install additional required filters
;; Install additional required filters.
(("instfilter texttopdf texttopdf pdf")
(string-append
"instfilter texttopdf texttopdf pdf;"
@ -368,15 +364,15 @@ (define-public cups
"instfilter rastertopdf rastertopdf pdf;"
"instfilter pstopdf pstopdf pdf"))
;; specify location of lpstat binary
;; Specify the location of the lpstat binary.
(("description=\"`lpstat -l")
"description=\"`../systemv/lpstat -l")
;; patch shebangs of embedded scripts
;; Patch the shebangs of embedded scripts.
(("#!/bin/sh") (string-append "#!" (which "sh")))
;; also link mime definitions from cups-filters
;; to enable the additional filters for the test suite
;; Also link MIME definitions from cups-filters
;; to enable the additional filters for the test suite.
(("ln -s \\$root/conf/mime\\.types")
(string-append
"ln -s " filters
@ -388,32 +384,22 @@ (define-public cups
"/share/cups/mime/cupsfilters.convs $BASE/share/mime; "
"ln -s $root/conf/mime.convs")))
;; fix search path for "cat"
;; Fix the search path for the "cat" command.
(substitute* "cups/testfile.c"
(("cupsFileFind\\(\"cat\", \"/bin\"")
(string-append "cupsFileFind(\"cat\", \"" catpath "\""))
(("cupsFileFind\\(\"cat\", \"/bin:/usr/bin\"")
(string-append "cupsFileFind(\"cat\", \"" catpath "\"")))
#t)))
;; Make the compressed manpages writable so that the
;; reset-gzip-timestamps phase does not error out.
(add-before 'reset-gzip-timestamps 'make-manpages-writable
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(man (string-append out "/share/man")))
(for-each (lambda (file) (chmod file #o644))
(find-files man "\\.gz"))
#t)))
(string-append "cupsFileFind(\"cat\", \"" catpath "\""))))))
(add-after 'install 'install-cups-filters-symlinks
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(cups-filters (assoc-ref inputs "cups-filters")))
;; charsets
;; Charsets.
(symlink
(string-append cups-filters "/share/cups/charsets")
(string-append out "/share/charsets"))
;; mime types, driver file, ppds
;; MIME types, driver files, and PPDs.
(for-each
(lambda (f)
(symlink (string-append cups-filters f)
@ -423,14 +409,15 @@ (define-public cups
"/share/cups/drv/cupsfilters.drv"
"/share/ppd"))
;; filters
;; Filters.
(for-each
(lambda (f)
(symlink f
(string-append out "/lib/cups/filter" (basename f))))
(string-append out "/lib/cups/filter"
(basename f))))
(find-files (string-append cups-filters "/lib/cups/filter")))
;; backends
;; Backends.
(for-each
(lambda (f)
(symlink (string-append cups-filters f)
@ -439,19 +426,17 @@ (define-public cups
'("/lib/cups/backend/parallel"
"/lib/cups/backend/serial"))
;; banners
;; Banners.
(let ((banners "/share/cups/banners"))
(delete-file-recursively (string-append out banners))
(symlink (string-append cups-filters banners)
(string-append out banners)))
;; assorted data
;; Assorted data.
(let ((data "/share/cups/data"))
(delete-file-recursively (string-append out data))
(symlink (string-append cups-filters data)
(string-append out data)))
#t))))))
(string-append out data))))))))))
(inputs
`(("avahi" ,avahi)
("gnutls" ,gnutls)