bug#66593: closed ([PATCH] gnu: cups: Fix cross-compiling.)

[GNU bug Tracking System]

Your message dated Thu, 26 Oct 2023 10:31:48 +0200
with message-id <87v8atkcnf.fsf@gnu.org>
and subject line Re: [bug#66593] [PATCH] gnu: cups: Fix cross-compiling.
has caused the debbugs.gnu.org bug report #66593,
regarding [PATCH] gnu: cups: Fix cross-compiling.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
66593: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=66593
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: cups: Fix cross-compiling.
>
>
>
>
> Date: 
>
> Tue, 17 Oct 2023 22:43:56 +0800
>
>
>
>
> * gnu/packages/cups.scm (cups-filters)[native-inputs]: When cross-compiling
> add cups-minimal.
> (cups-minimal)[native-inputs]: When cross-compiling add this-package.
> ---
>  gnu/packages/cups.scm | 13 ++++++++++---
>  1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
> index 647b89dc03..fc26fd70ca 100644
> --- a/gnu/packages/cups.scm
> +++ b/gnu/packages/cups.scm
> @@ -8,6 +8,7 @@
>  ;;; Copyright ?? 2017???2022 Tobias Geerinckx-Rice <me@tobias.gr>
>  ;;; Copyright ?? 2020 Marius Bakke <mbakke@fastmail.com>
>  ;;; Copyright ?? 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
> +;;; Copyright ?? 2023 Zheng Junjie <873216071@qq.com>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -204,8 +205,11 @@ (define-public cups-filters
>                      (find-files (string-append #$output
>                                                 "/lib/cups/filter"))))))))
>      (native-inputs
> -     (list `(,glib "bin")               ; for gdbus-codegen
> -           pkg-config))
> +     (append (if (%current-target-system)
> +                 (list cups-minimal)
> +                 '())
> +             (list `(,glib "bin")               ; for gdbus-codegen
> +                   pkg-config)))
>      (inputs
>       (list avahi
>             fontconfig
> @@ -315,7 +319,10 @@ (define-public cups-minimal
>                       ;; to a missing font.  Substitute the last observed count.
>                       (("(\\$count != )33" _ prefix)
>                        (string-append prefix "39"))))))))
> -    (native-inputs (list config pkg-config))
> +    (native-inputs (cons* config pkg-config
> +                          (if (%current-target-system)
> +                              (list this-package)
> +                              '())))
>      (inputs (list zlib gnutls))
>      (home-page "https://openprinting.github.io/cups";)
>      (synopsis "The Common Unix Printing System")
>
> base-commit: e80022ff3adde3184bed6758f604e3aa12942865
> -- 
> 2.41.0
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [bug#66593] [PATCH] gnu: cups: Fix cross-compiling.
>
>
>
>
> Date: 
>
> Thu, 26 Oct 2023 10:31:48 +0200
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13)
>
>
>
>
> > * gnu/packages/cups.scm (cups-filters)[native-inputs]: When cross-compiling
> > add cups-minimal.
> > (cups-minimal)[native-inputs]: When cross-compiling add this-package.
>
> Tested with:
>
> --8<---------------cut here---------------start------------->8---
> ./pre-inst-env guix build cups --target=aarch64-linux-gnu
> --8<---------------cut here---------------end--------------->8---
>
> and builds fine.
>
> Applied, thanks!
>
> Mathieu
>
>
> --- End Message ---