From 25285f8516a3129230357cf4edec2d47c8ab89c4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 14 Mar 2016 13:02:48 +0100 Subject: [PATCH] gnu: htsjdk: Use ant-build-system. * gnu/packages/bioinformatics.scm (htsjdk)[build-system]: Use ant-build-system. [arguments]: Adapt for ant-build-system. --- gnu/packages/bioinformatics.scm | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ed2b634..5dedf10 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -26,6 +26,7 @@ #:use-module (guix utils) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix build-system ant) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix build-system perl) @@ -2052,24 +2053,17 @@ from high-throughput sequencing assays.") (snippet '(substitute* "build.xml" (("failifexecutionfails=\"true\"") "failifexecutionfails=\"false\""))))) - (build-system gnu-build-system) + (build-system ant-build-system) (arguments - `(#:modules ((srfi srfi-1) - (guix build gnu-build-system) - (guix build utils)) - #:phases (alist-replace - 'build - (lambda _ - (setenv "JAVA_HOME" (assoc-ref %build-inputs "jdk")) - (zero? (system* "ant" "all" - (string-append "-Ddist=" - (assoc-ref %outputs "out") - "/share/java/htsjdk/")))) - (fold alist-delete %standard-phases - '(configure install check))))) - (native-inputs - `(("ant" ,ant) - ("jdk" ,icedtea "jdk"))) + `(#:tests? #f ; test require Internet access + #:make-flags + (list (string-append "-Ddist=" (assoc-ref %outputs "out") + "/share/java/htsjdk/")) + #:build-target "all" + #:phases + (modify-phases %standard-phases + ;; The build phase also installs the jars + (delete 'install)))) (home-page "http://samtools.github.io/htsjdk/") (synopsis "Java API for high-throughput sequencing data (HTS) formats") (description -- 2.1.0