From 9047a31152a2ad8ba6dfbbe7effa9b91f542945d Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 26 Apr 2022 18:16:38 +0530 Subject: 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 --- 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 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") -- cgit v1.2.3