me
/
guix
Archived
1
0
Fork 0
Code

gnu: cups: Return #t from all phases. 

* gnu/packages/cups.scm (cups, cups-minimal): Return #t from all phases.
master
Mark H Weaver 2018-03-18 02:33:42 -04:00
parent e923cee1b9
commit 74c164e000
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/cups.scm
View File

@ -198,7 +198,8 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.")
(lambda _ (lambda _
(substitute* "Makedefs.in" (substitute* "Makedefs.in"
(("INITDIR.*=.*@INITDIR@") "INITDIR = @prefix@/@INITDIR@") (("INITDIR.*=.*@INITDIR@") "INITDIR = @prefix@/@INITDIR@")
(("/bin/sh") (which "sh"))))) (("/bin/sh") (which "sh")))
#t))
;; Make the compressed manpages writable so that the ;; Make the compressed manpages writable so that the
;; reset-gzip-timestamps phase does not error out. ;; reset-gzip-timestamps phase does not error out.
(add-before 'reset-gzip-timestamps 'make-manpages-writable (add-before 'reset-gzip-timestamps 'make-manpages-writable
@ -206,12 +207,14 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.")
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(man (string-append out "/share/man"))) (man (string-append out "/share/man")))
(for-each (lambda (file) (chmod file #o644)) (for-each (lambda (file) (chmod file #o644))
(find-files man "\\.gz"))))) (find-files man "\\.gz"))
#t)))
(add-before 'build 'patch-tests (add-before 'build 'patch-tests
(lambda _ (lambda _
(substitute* "test/ippserver.c" (substitute* "test/ippserver.c"
(("# else /\\* HAVE_AVAHI \\*/") (("# else /\\* HAVE_AVAHI \\*/")
"#elif defined(HAVE_AVAHI)"))))))) "#elif defined(HAVE_AVAHI)"))
#t)))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(inputs (inputs
@ -249,7 +252,8 @@ device-specific programs to convert and print many types of files.")
(lambda _ (lambda _
(substitute* "Makedefs.in" (substitute* "Makedefs.in"
(("INITDIR.*=.*@INITDIR@") "INITDIR = @prefix@/@INITDIR@") (("INITDIR.*=.*@INITDIR@") "INITDIR = @prefix@/@INITDIR@")
(("/bin/sh") (which "sh"))))) (("/bin/sh") (which "sh")))
#t))
(add-before 'check 'patch-tests (add-before 'check 'patch-tests
(lambda _ (lambda _
(let ((filters (assoc-ref %build-inputs "cups-filters")) (let ((filters (assoc-ref %build-inputs "cups-filters"))
@ -307,7 +311,8 @@ device-specific programs to convert and print many types of files.")
(("cupsFileFind\\(\"cat\", \"/bin\"") (("cupsFileFind\\(\"cat\", \"/bin\"")
(string-append "cupsFileFind(\"cat\", \"" catpath "\"")) (string-append "cupsFileFind(\"cat\", \"" catpath "\""))
(("cupsFileFind\\(\"cat\", \"/bin:/usr/bin\"") (("cupsFileFind\\(\"cat\", \"/bin:/usr/bin\"")
(string-append "cupsFileFind(\"cat\", \"" catpath "\"")))))) (string-append "cupsFileFind(\"cat\", \"" catpath "\"")))
#t)))
;; Make the compressed manpages writable so that the ;; Make the compressed manpages writable so that the
;; reset-gzip-timestamps phase does not error out. ;; reset-gzip-timestamps phase does not error out.
(add-before 'reset-gzip-timestamps 'make-manpages-writable (add-before 'reset-gzip-timestamps 'make-manpages-writable
@ -315,7 +320,8 @@ device-specific programs to convert and print many types of files.")
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(man (string-append out "/share/man"))) (man (string-append out "/share/man")))
(for-each (lambda (file) (chmod file #o644)) (for-each (lambda (file) (chmod file #o644))
(find-files man "\\.gz"))))) (find-files man "\\.gz"))
#t)))
(add-after 'install 'install-cups-filters-symlinks (add-after 'install 'install-cups-filters-symlinks
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
@ -361,7 +367,9 @@ device-specific programs to convert and print many types of files.")
(let ((data "/share/cups/data")) (let ((data "/share/cups/data"))
(delete-file-recursively (string-append out data)) (delete-file-recursively (string-append out data))
(symlink (string-append cups-filters data) (symlink (string-append cups-filters data)
(string-append out data))))))))) (string-append out data)))
#t))))))
(inputs (inputs
`(("avahi" ,avahi) `(("avahi" ,avahi)
("gnutls" ,gnutls) ("gnutls" ,gnutls)