ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 13:58:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: cups: Return #t from all phases.

Browse source 
* gnu/packages/cups.scm (cups, cups-minimal): Return #t from all phases.
This commit is contained in:
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 @@ (define-public cups-minimal
(lambda _
(substitute* "Makedefs.in"
(("INITDIR.*=.*@INITDIR@") "INITDIR = @prefix@/@INITDIR@")
(("/bin/sh") (which "sh")))))
(("/bin/sh") (which "sh")))
#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
@ -206,12 +207,14 @@ (define-public cups-minimal
(let* ((out (assoc-ref outputs "out"))
(man (string-append out "/share/man")))
(for-each (lambda (file) (chmod file #o644))
(find-files man "\\.gz")))))
(find-files man "\\.gz"))
#t)))
(add-before 'build 'patch-tests
(lambda _
(substitute* "test/ippserver.c"
(("# else /\\* HAVE_AVAHI \\*/")
"#elif defined(HAVE_AVAHI)")))))))
"#elif defined(HAVE_AVAHI)"))
#t)))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
@ -249,7 +252,8 @@ (define-public cups
(lambda _
(substitute* "Makedefs.in"
(("INITDIR.*=.*@INITDIR@") "INITDIR = @prefix@/@INITDIR@")
(("/bin/sh") (which "sh")))))
(("/bin/sh") (which "sh")))
#t))
(add-before 'check 'patch-tests
(lambda _
(let ((filters (assoc-ref %build-inputs "cups-filters"))
@ -307,7 +311,8 @@ (define-public cups
(("cupsFileFind\\(\"cat\", \"/bin\"")
(string-append "cupsFileFind(\"cat\", \"" catpath "\""))
(("cupsFileFind\\(\"cat\", \"/bin:/usr/bin\"")
(string-append "cupsFileFind(\"cat\", \"" catpath "\""))))))
(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
@ -315,7 +320,8 @@ (define-public cups
(let* ((out (assoc-ref outputs "out"))
(man (string-append out "/share/man")))
(for-each (lambda (file) (chmod file #o644))
(find-files man "\\.gz")))))
(find-files man "\\.gz"))
#t)))
(add-after 'install 'install-cups-filters-symlinks
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
@ -361,7 +367,9 @@ (define-public cups
(let ((data "/share/cups/data"))
(delete-file-recursively (string-append out data))
(symlink (string-append cups-filters data)
(string-append out data)))))))))
(string-append out data)))
#t))))))
(inputs
`(("avahi" ,avahi)
("gnutls" ,gnutls)