From: dan <i@dan.games>
To: 70492@debbugs.gnu.org
Cc: david.elsing@posteo.net, othacehe@gnu.org, ludo@gnu.org,
efraim@flashner.co.il, 66866@debbugs.gnu.org, janneke@gnu.org
Subject: [bug#70492] [PATCH] build-system: copy: Fix cross-compilation.
Date: Sun, 21 Apr 2024 15:12:30 +0800 [thread overview]
Message-ID: <20a614ca2a6064bfa597cd11b7b87ceb926de866.1713682643.git.i@dan.games> (raw)
* guix/build-system/copy.scm (lower): Change arguments passed to host-inputs
and build-inputs.
Change-Id: I2991854b48587ab00ccc03712304e2850727e6b7
---
This patch tries to fix a issue related to grafting when cross-compiling.
See https://issues.guix.gnu.org/66866 for more discussion.
guix/build-system/copy.scm | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/guix/build-system/copy.scm b/guix/build-system/copy.scm
index d58931b33c..64bd61a53f 100644
--- a/guix/build-system/copy.scm
+++ b/guix/build-system/copy.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2021, 2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2023 Jonathan Brielmaier <jonathan.brielmaier@web.de>
+;;; Copyright © 2024 dan <i@dan.games>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -66,13 +67,13 @@ (define* (lower name
(bag
(name name)
(system system)
- (host-inputs `(,@(if source
- `(("source" ,source))
- '())
- ,@inputs
- ;; Keep the standard inputs of 'gnu-build-system'.
- ,@(standard-packages)))
- (build-inputs native-inputs)
+ (build-inputs `(,@(if source
+ `(("source" ,source))
+ '())
+ ,@inputs
+ ,@native-inputs
+ ;; Keep the standard inputs of 'gnu-build-system'.
+ ,@(standard-packages)))
(outputs outputs)
(build copy-build)
(arguments (strip-keyword-arguments private-keywords arguments))))
base-commit: 38b88d710ea13ba024aed0543bc2862772cdb645
--
2.41.0
reply other threads:[~2024-04-21 7:14 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20a614ca2a6064bfa597cd11b7b87ceb926de866.1713682643.git.i@dan.games \
--to=i@dan.games \
--cc=66866@debbugs.gnu.org \
--cc=70492@debbugs.gnu.org \
--cc=david.elsing@posteo.net \
--cc=efraim@flashner.co.il \
--cc=janneke@gnu.org \
--cc=ludo@gnu.org \
--cc=othacehe@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.