summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Isaac <arunisaac@systemreboot.net>2022-04-26 18:16:38 +0530
committerEfraim Flashner <efraim@flashner.co.il>2022-05-09 11:19:39 +0300
commit9047a31152a2ad8ba6dfbbe7effa9b91f542945d (patch)
treec9d1b91b3543ea985f0b743bb9f9bfb0da24a168
parent9a68c075076027f04847a9836c27a0c1a9a7dec1 (diff)
downloadguix-patches-9047a31152a2ad8ba6dfbbe7effa9b91f542945d.tar
guix-patches-9047a31152a2ad8ba6dfbbe7effa9b91f542945d.tar.gz
gnu: vcflib: Find submodule sources in native-inputs during cross-compilation.
* gnu/packages/bioinformatics.scm (vcflib)[arguments]: In the unpack-submodule-sources phase, look for submodule sources in both inputs and native-inputs. Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
-rw-r--r--gnu/packages/bioinformatics.scm14
1 files changed, 8 insertions, 6 deletions
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 326bde6da8..d54ddeb575 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -14618,15 +14618,17 @@ library automatically handles index file generation and use.")
(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")