From 23376668339b126b0270bcfcea9d9044903ff05e Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Tue, 17 Oct 2023 22:43:56 +0800 Subject: [PATCH] gnu: cups: Fix cross-compiling. * gnu/packages/cups.scm (cups-filters)[native-inputs]: When cross-compiling add cups-minimal. (cups-minimal)[native-inputs]: When cross-compiling add this-package. Signed-off-by: Mathieu Othacehe Change-Id: Ifcc34f09d0a5afb3a1b95be51715c509b8ef5ed4 --- 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 fc3ff52cbe..731091ea7d 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017–2022 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2021, 2023 Maxim Cournoyer +;;; 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")