[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/13: gnu: java-picard-1.113: Drop trailing #T from build phases.
From: |
guix-commits |
Subject: |
12/13: gnu: java-picard-1.113: Drop trailing #T from build phases. |
Date: |
Fri, 19 May 2023 07:13:46 -0400 (EDT) |
rekado pushed a commit to branch master
in repository guix.
commit 1baf94dbbe9a8e52a3e745540836acf59d9500a1
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Fri May 19 13:10:37 2023 +0200
gnu: java-picard-1.113: Drop trailing #T from build phases.
* gnu/packages/bioinformatics.scm (java-picard-1.113)[arguments]: Remove
trailing #T from build phases.
---
gnu/packages/bioinformatics.scm | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index b2d0f90761..1e7404549b 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -5640,8 +5640,7 @@ VCF.")
'(begin
;; Delete pre-built binaries.
(delete-file-recursively "lib")
- (mkdir-p "lib")
- #t))))
+ (mkdir-p "lib")))))
(build-system ant-build-system)
(arguments
`(#:build-target "picard-jar"
@@ -5671,8 +5670,7 @@ VCF.")
(("name=\"test\" depends=\"compile, ")
"name=\"test\" depends=\"compile-tests, ")
(("name=\"compile\" depends=\"compile-src, compile-tests\"")
- "name=\"compile\" depends=\"compile-src\""))
- #t))
+ "name=\"compile\" depends=\"compile-src\""))))
(add-after 'unpack 'fix-deflater-path
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "src/java/net/sf/samtools/Defaults.java"
@@ -5680,8 +5678,7 @@ VCF.")
(string-append "getStringProperty(\"intel_deflater_so_path\",
\""
(assoc-ref outputs "out")
"/lib/jni/libIntelDeflater.so"
- "\")")))
- #t))
+ "\")")))))
;; Build the deflater library, because we've previously deleted the
;; pre-built one. This can only be built with access to the JDK
;; sources.
@@ -5704,25 +5701,21 @@ VCF.")
"-c" "-O3" "-fPIC" "IntelDeflater.c")
(invoke "gcc" "-shared"
"-o" "../../../lib/jni/libIntelDeflater.so"
- "IntelDeflater.o" "-lz" "-lstdc++"))
- #t))
+ "IntelDeflater.o" "-lz" "-lstdc++"))))
;; We can only build everything else after building the JNI library.
(add-after 'build-jni 'build-rest
(lambda* (#:key make-flags #:allow-other-keys)
- (apply invoke `("ant" "all" ,@make-flags))
- #t))
+ (apply invoke `("ant" "all" ,@make-flags))))
(add-before 'build 'set-JAVA6_HOME
(lambda _
- (setenv "JAVA6_HOME" (getenv "JAVA_HOME"))
- #t))
+ (setenv "JAVA6_HOME" (getenv "JAVA_HOME"))))
(replace 'install (install-jars "dist"))
(add-after 'install 'install-jni-lib
(lambda* (#:key outputs #:allow-other-keys)
(let ((jni (string-append (assoc-ref outputs "out")
"/lib/jni")))
(mkdir-p jni)
- (install-file "lib/jni/libIntelDeflater.so" jni)
- #t))))))
+ (install-file "lib/jni/libIntelDeflater.so" jni)))))))
(inputs
`(("java-snappy-1" ,java-snappy-1)
("java-commons-jexl-2" ,java-commons-jexl-2)
- 02/13: gnu: serd: Update to 0.30.16., (continued)
- 02/13: gnu: serd: Update to 0.30.16., guix-commits, 2023/05/19
- 01/13: gnu: zplugins: Update to 0.2.5., guix-commits, 2023/05/19
- 04/13: gnu: libbacktrace: Update to 1.0-2.cdb64b6., guix-commits, 2023/05/19
- 03/13: gnu: sord: Update to 0.16.14., guix-commits, 2023/05/19
- 07/13: gnu: lvtk-1: Build with gtkmm-2., guix-commits, 2023/05/19
- 09/13: gnu: ams-lv2: Remove trailing #T from build phase., guix-commits, 2023/05/19
- 06/13: gnu: zix: Update to 0.3.3-0.a13ae5a., guix-commits, 2023/05/19
- 08/13: gnu: ams-lv2: Drop package labels., guix-commits, 2023/05/19
- 10/13: gnu: ztoolkit-rsvg: Use librsvg-for-system., guix-commits, 2023/05/19
- 11/13: gnu: zrythm: Update to 1.0.0-beta.4.9.1., guix-commits, 2023/05/19
- 12/13: gnu: java-picard-1.113: Drop trailing #T from build phases.,
guix-commits <=
- 13/13: gnu: java-picard-1.113: Drop input package labels., guix-commits, 2023/05/19