Re: core-updates: Fix cups-minimal build failure

[Marius Bakke <mbakke@fastmail.com>]

[-- Attachment #1: Type: text/plain, Size: 2377 bytes --]

Leo Famulari <leo@famulari.name> writes:

> Do you have any suggestions about how to make this more concise?
> From 0191e8394eedd271494b5e1e8c8eb131176440a8 Mon Sep 17 00:00:00 2001
> From: Leo Famulari <leo@famulari.name>
> Date: Sat, 25 Feb 2017 21:22:08 -0500
> Subject: [PATCH] gnu: cups-minimal: Fix build failure in reset-gzip-timestamps
>  phase.
>
> * gnu/packages/cups.scm (cups-minimal)[arguments]: Add 'make-manpages-writable'
> phase.
> ---
>  gnu/packages/cups.scm | 17 +++++++++++++++++
>  1 file changed, 17 insertions(+)
>
> diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
> index 20621e32b..ebb979c62 100644
> --- a/gnu/packages/cups.scm
> +++ b/gnu/packages/cups.scm
> @@ -166,6 +166,23 @@ filters for the PDF-centric printing workflow introduced by OpenPrinting.")
>               (substitute* "Makedefs.in"
>                 (("INITDIR.*=.*@INITDIR@") "INITDIR = @prefix@/@INITDIR@")
>                 (("/bin/sh") (which "sh")))))
> +         ;; 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"))
> +                    (man1 (string-append out "/share/man/man1"))
> +                    (man5 (string-append out "/share/man/man5"))
> +                    (man7 (string-append out "/share/man/man7"))
> +                    (man8 (string-append out "/share/man/man8")))
> +               (for-each (lambda (file) (chmod file #o666))
> +                         (find-files man1 "\\.gz"))
> +               (for-each (lambda (file) (chmod file #o666))
> +                         (find-files man5 "\\.gz"))
> +               (for-each (lambda (file) (chmod file #o666))
> +                         (find-files man7 "\\.gz"))
> +               (for-each (lambda (file) (chmod file #o666))
> +                         (find-files man8 "\\.gz")))))

Would it work to simply run this on all of "out/share/man", instead of
explicitly specifying the sections?

I would also use 0644 perms here, not that it matters though!

>           (add-before 'build 'patch-tests
>             (lambda _
>               (substitute* "test/ippserver.c"
> -- 
> 2.11.1

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]