From a99054795240cb7c17754816127a86d764fe76db Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 26 Apr 2022 18:16:32 +0530 Subject: [PATCH] gnu: tabixpp: Use #:make-flags. * gnu/packages/bioinformatics.scm (tabixpp)[arguments]: Do not override the build phase. Move the required make arguments to #:make-flags. Add build-libraries phase. Signed-off-by: Efraim Flashner --- gnu/packages/bioinformatics.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ed4836998b..35e575d17c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14298,18 +14298,18 @@ mutations from scRNA-Seq data.") (inputs (list htslib zlib)) (arguments - (list #:tests? #f ; There are no tests to run. + (list #:make-flags #~(list "HTS_HEADERS=" + (string-append "HTS_LIB=" + (search-input-file %build-inputs + "/lib/libhts.a")) + "INCLUDES=") + #:tests? #f ; There are no tests to run. #:phases #~(modify-phases %standard-phases (delete 'configure) ; There is no configure phase. - ;; The build phase needs overriding the location of htslib. - (replace 'build + ;; Build shared and static libraries. + (add-after 'build 'build-libraries (lambda* (#:key inputs #:allow-other-keys) - (invoke "make" - (string-append "HTS_LIB=" (search-input-file inputs "/lib/libhts.a")) - (string-append "INCLUDES= -I" (search-input-directory inputs "/include/htslib")) - "HTS_HEADERS=" ; No need to check for headers here. - (string-append "LIBPATH=-L. -L" (search-input-directory inputs "/include"))) (invoke "g++" "-shared" "-o" "libtabixpp.so" "tabix.o" "-lhts") (invoke "ar" "rcs" "libtabixpp.a" "tabix.o"))) (replace 'install