guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

127/135: gnu: bedtools-2.18: Fix build with newer toolchain.


From: guix-commits
Subject: 127/135: gnu: bedtools-2.18: Fix build with newer toolchain.
Date: Wed, 3 Nov 2021 18:00:21 -0400 (EDT)

rekado pushed a commit to branch master
in repository guix.

commit d54a4285ea92f899ad5a0309de9215447139fe5f
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Wed Nov 3 08:14:56 2021 +0000

    gnu: bedtools-2.18: Fix build with newer toolchain.
    
    * gnu/packages/bioinformatics.scm (bedtools-2.18)[arguments]: Add phase
    'compatibility, fixing syntax quirks that are problematic with newer
    toolchains.
    [native-inputs]: Do not inherit.
    [inherit]: Do not inherit.
---
 gnu/packages/bioinformatics.scm | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index fbcd571..a731b9a 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -544,14 +544,26 @@ BED, GFF/GTF, VCF.")
      '(#:test-target "test"
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'compatibility
+           (lambda _
+             (substitute* "src/utils/fileType/FileRecordTypeChecker.h"
+               (("static const float PERCENTAGE")
+                "static constexpr float PERCENTAGE"))
+             (substitute* "src/utils/general/DualQueue.h"
+               (("template <class T, template<class T> class CompareFunc>")
+                "template <class T, template<class U> class CompareFunc>"))))
          (delete 'configure)
          (replace 'install
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((bin (string-append (assoc-ref outputs "out") "/bin/")))
                (for-each (lambda (file)
                            (install-file file bin))
-                         (find-files "bin" ".*")))
-             #t)))))))
+                         (find-files "bin" ".*"))))))))
+    (native-inputs
+     `(("python" ,python-wrapper)))
+    (inputs
+     `(("samtools" ,samtools)
+       ("zlib" ,zlib)))))
 
 (define-public pbbam
   (package



reply via email to

[Prev in Thread] Current Thread [Next in Thread]