summary refs log tree commit diff
path: root/gnu/packages/bioinformatics.scm
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2018-11-07 20:24:18 +0100
committerRicardo Wurmus <rekado@elephly.net>2018-11-07 20:26:46 +0100
commit152bebd9e0c7fc0863d6b82af014e61a8cb6a488 (patch)
tree16ed100c552b041adb1b426343b1199dd91eab2c /gnu/packages/bioinformatics.scm
parentb113f39019913ad8eda4d72624ce9769920d22cb (diff)
downloadguix-152bebd9e0c7fc0863d6b82af014e61a8cb6a488.tar.gz
gnu: gemma: Update to 0.98.
* gnu/local.mk (dist_patch_DATA): Remove patch.
* gnu/packages/patches/gemma-intel-compat.patch: Remove file.
* gnu/packages/bioinformatics.scm (gemma): Update to 0.98.
[source]: Remove patch.
[inputs]: Add eigen, gfortran:lib, and openblas.
[arguments]: Add phase "find-eigen".
Diffstat (limited to 'gnu/packages/bioinformatics.scm')
-rw-r--r--gnu/packages/bioinformatics.scm19
1 files changed, 15 insertions, 4 deletions
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 3cd0e03587..5337b7bf02 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2829,7 +2829,7 @@ comment or quality sections.")
 (define-public gemma
   (package
     (name "gemma")
-    (version "0.96")
+    (version "0.98")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2838,11 +2838,13 @@ comment or quality sections.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0sa4mllp7890v5pss0mm02ik8yixl7az3vprcw3kp7qmr9gwrdai"))
-              (patches (search-patches "gemma-intel-compat.patch"))))
+                "1s3ncnbn45r2hh1cvrqky1kbqq6546biypr4f5mkw1kqlrgyh0yg"))))
     (inputs
-     `(("gsl" ,gsl)
+     `(("eigen" ,eigen)
+       ("gfortran" ,gfortran "lib")
+       ("gsl" ,gsl)
        ("lapack" ,lapack)
+       ("openblas" ,openblas)
        ("zlib" ,zlib)))
     (build-system gnu-build-system)
     (arguments
@@ -2857,6 +2859,15 @@ comment or quality sections.")
        #:phases
        (modify-phases %standard-phases
          (delete 'configure)
+         (add-after 'unpack 'find-eigen
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; Ensure that Eigen headers can be found
+             (setenv "CPLUS_INCLUDE_PATH"
+                     (string-append (getenv "CPLUS_INCLUDE_PATH")
+                                    ":"
+                                    (assoc-ref inputs "eigen")
+                                    "/include/eigen3"))
+             #t))
          (add-before 'build 'bin-mkdir
           (lambda _
             (mkdir-p "bin")