summary refs log tree commit diff
diff options
context:
space:
mode:
authorGábor Boskovits <boskovits@gmail.com>2018-07-26 12:42:59 +0200
committerGábor Boskovits <boskovits@gmail.com>2018-07-26 12:46:50 +0200
commitd60772dcdd55c0f8e236d40b76eb06eab790ab77 (patch)
treee127069600668287eb88e866785c82c5b312604d
parentbca72b39c7548ac861d904f6230ef2c3a0fb0110 (diff)
downloadguix-d60772dcdd55c0f8e236d40b76eb06eab790ab77.tar.gz
gnu: java-picard: Fix manifest.
* gnu/packages/bioinformatics.scm (java-picard)[arguments]: Adjust phase
'edit-classpath-in-manifest for the new manifest generation code.
-rw-r--r--gnu/packages/bioinformatics.scm7
1 files changed, 6 insertions, 1 deletions
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 245e7dd564..73cca16717 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
+;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3240,12 +3241,16 @@ VCF.")
                                            (msg (format #f
                                                         "\
 Class-Path: /~a \
- ~a/share/java/htsjdk.jar${line.separator}"
+ ~a/share/java/htsjdk.jar${line.separator}${line.separator}"
                                                         ;; maximum line length is 70
                                                         (string-tabulate (const #\b) 57)
                                                         (assoc-ref inputs "java-htsjdk"))))
                                        (if (member "manifest" name)
                                            `(,tag ,@kids
+                                                  (replaceregexp
+                                                   (@ (file "${manifest.file}")
+                                                      (match "\\r\\n\\r\\n")
+                                                      (replace "${line.separator}")))
                                                   (echo
                                                    (@ (message ,msg)
                                                       (file "${manifest.file}")