unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Arun Isaac <arunisaac@systemreboot.net>
To: 55125@debbugs.gnu.org
Cc: Arun Isaac <arunisaac@systemreboot.net>
Subject: [bug#55125] [PATCH 8/9] gnu: vcflib: Find submodule sources in native-inputs during cross-compilation.
Date: Tue, 26 Apr 2022 18:16:38 +0530	[thread overview]
Message-ID: <20220426124639.17159-8-arunisaac@systemreboot.net> (raw)
In-Reply-To: <20220426124639.17159-1-arunisaac@systemreboot.net>

* gnu/packages/bioinformatics.scm (vcflib)[arguments]: In the
unpack-submodule-sources phase, look for submodule sources in both inputs and
native-inputs.
---
 gnu/packages/bioinformatics.scm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index d74b8a0eb6..b4d809b4db 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -14599,15 +14599,17 @@ (define-public vcflib
                    (substitute* "test/Makefile"
                      (("libvcflib.a") "libvcflib.so"))))
                (add-after 'unpack 'unpack-submodule-sources
-                 (lambda* (#:key inputs #:allow-other-keys)
+                 (lambda* (#:key inputs native-inputs #:allow-other-keys)
                    (let ((unpack (lambda (source target)
                                    (mkdir target)
                                    (with-directory-excursion target
-                                     (if (file-is-directory? (assoc-ref inputs source))
-                                         (copy-recursively (assoc-ref inputs source) ".")
-                                         (invoke "tar" "xvf"
-                                                 (assoc-ref inputs source)
-                                                 "--strip-components=1"))))))
+                                     (let ((source (or (assoc-ref inputs source)
+                                                       (assoc-ref native-inputs source))))
+                                       (if (file-is-directory? source)
+                                           (copy-recursively source ".")
+                                           (invoke "tar" "xvf"
+                                                   source
+                                                   "--strip-components=1")))))))
                      (and
                       (unpack "filevercmp-src" "filevercmp")
                       (unpack "fsom-src" "fsom")
-- 
2.35.1





  parent reply	other threads:[~2022-04-26 12:56 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-26 12:44 [bug#55125] [PATCH 0/9] Cross-compile vcflib for RISC-V Arun Isaac
2022-04-26 12:46 ` [bug#55125] [PATCH 1/9] gnu: tabixpp: Use G-expressions Arun Isaac
2022-04-26 12:46   ` [bug#55125] [PATCH 2/9] gnu: tabixpp: Use #:make-flags Arun Isaac
2022-04-26 12:46   ` [bug#55125] [PATCH 3/9] gnu: tabixpp: Use build tools specific to the target Arun Isaac
2022-04-26 12:46   ` [bug#55125] [PATCH 4/9] gnu: tabixpp: Add bzip2 and xz to inputs Arun Isaac
2022-04-26 12:46   ` [bug#55125] [PATCH 5/9] gnu: fastahack: Use G-expressions Arun Isaac
2022-04-26 12:46   ` [bug#55125] [PATCH 6/9] gnu: fastahack: Use compiler specific to the build target Arun Isaac
2022-04-26 12:46   ` [bug#55125] [PATCH 7/9] gnu: vcflib: Use G-expressions Arun Isaac
2022-04-26 12:46   ` Arun Isaac [this message]
2022-04-26 12:46   ` [bug#55125] [PATCH 9/9] gnu: vcflib: Set absolute path to pkg-config Arun Isaac
2022-05-07 21:45 ` [bug#55125] [PATCH 0/9] Cross-compile vcflib for RISC-V Ludovic Courtès
2022-05-12  7:57   ` Arun Isaac
2022-05-09  8:31 ` bug#55125: " Efraim Flashner

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

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220426124639.17159-8-arunisaac@systemreboot.net \
    --to=arunisaac@systemreboot.net \
    --cc=55125@debbugs.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 public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).