[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/11: gnu: vcflib: Find submodule sources in native-inputs during cross
From: |
guix-commits |
Subject: |
10/11: gnu: vcflib: Find submodule sources in native-inputs during cross-compilation. |
Date: |
Mon, 9 May 2022 04:31:21 -0400 (EDT) |
efraim pushed a commit to branch master
in repository guix.
commit 9047a31152a2ad8ba6dfbbe7effa9b91f542945d
Author: Arun Isaac <arunisaac@systemreboot.net>
AuthorDate: Tue Apr 26 18:16:38 2022 +0530
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>
---
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")
- branch master updated (7bacea65ac -> 8d25887d87), guix-commits, 2022/05/09
- 03/11: gnu: tabixpp: Use G-expressions., guix-commits, 2022/05/09
- 08/11: gnu: fastahack: Use compiler specific to the build target., guix-commits, 2022/05/09
- 07/11: gnu: fastahack: Use G-expressions., guix-commits, 2022/05/09
- 09/11: gnu: vcflib: Use G-expressions., guix-commits, 2022/05/09
- 01/11: gnu: git-annex: Update to 10.20220504., guix-commits, 2022/05/09
- 04/11: gnu: tabixpp: Use #:make-flags., guix-commits, 2022/05/09
- 11/11: gnu: vcflib: Set absolute path to pkg-config., guix-commits, 2022/05/09
- 10/11: gnu: vcflib: Find submodule sources in native-inputs during cross-compilation.,
guix-commits <=
- 05/11: gnu: tabixpp: Use build tools specific to the target., guix-commits, 2022/05/09
- 02/11: gnu: gcc-11: Update to 11.3.0., guix-commits, 2022/05/09
- 06/11: gnu: tabixpp: Fix cross-compilation., guix-commits, 2022/05/09