diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2023-05-02 11:59:56 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2023-05-02 11:59:56 +0200 |
| commit | 7142f42c384b41db9fcb8c1fce09f6f643b15644 (patch) | |
| tree | 1f8125731dcdf164c953ad2ee7531842d7a1c121 | |
| parent | 4233422d77c0756fba5e96a6a457334704c8b4eb (diff) | |
rstudio: Replace catch.hpp.
* guix-science/packages/rstudio.scm (rstudio-server)[native-inputs]:
Add catch2.
[arguments]: Replace bundled catch.hpp.
| -rw-r--r-- | guix-science/packages/rstudio.scm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/guix-science/packages/rstudio.scm b/guix-science/packages/rstudio.scm index 1b4ea7b..59c0658 100644 --- a/guix-science/packages/rstudio.scm +++ b/guix-science/packages/rstudio.scm | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | ;;; | 1 | ;;; |
| 2 | ;;; Copyright © 2019, 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org> | 2 | ;;; Copyright © 2019, 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org> |
| 3 | ;;; Copyright © 2020 Roel Janssen <roel@gnu.org> | 3 | ;;; Copyright © 2020 Roel Janssen <roel@gnu.org> |
| 4 | ;;; Copyright © 2023 Ricardo Wurmus <rekado@elephly.net> | ||
| 4 | ;;; | 5 | ;;; |
| 5 | ;;; This program is free software; you can redistribute it and/or modify it | 6 | ;;; This program is free software; you can redistribute it and/or modify it |
| 6 | ;;; under the terms of the GNU General Public License as published by | 7 | ;;; under the terms of the GNU General Public License as published by |
| @@ -35,6 +36,7 @@ | |||
| 35 | #:use-module (gnu packages) | 36 | #:use-module (gnu packages) |
| 36 | #:use-module (gnu packages base) | 37 | #:use-module (gnu packages base) |
| 37 | #:use-module (gnu packages boost) | 38 | #:use-module (gnu packages boost) |
| 39 | #:use-module (gnu packages check) | ||
| 38 | #:use-module (gnu packages compression) | 40 | #:use-module (gnu packages compression) |
| 39 | #:use-module (gnu packages cran) | 41 | #:use-module (gnu packages cran) |
| 40 | #:use-module (gnu packages databases) | 42 | #:use-module (gnu packages databases) |
| @@ -127,6 +129,8 @@ for assistive technology like screen readers.") | |||
| 127 | ;; change the default paths for mathjax and pandoc and a hardcoded call to `which` | 129 | ;; change the default paths for mathjax and pandoc and a hardcoded call to `which` |
| 128 | (add-after 'unpack 'patch-paths | 130 | (add-after 'unpack 'patch-paths |
| 129 | (lambda* (#:key inputs #:allow-other-keys) | 131 | (lambda* (#:key inputs #:allow-other-keys) |
| 132 | (install-file (search-input-file inputs "/include/catch2/catch.hpp") | ||
| 133 | "src/cpp/tests/cpp/tests/vendor/") | ||
| 130 | (substitute* "src/cpp/session/session-options.json" | 134 | (substitute* "src/cpp/session/session-options.json" |
| 131 | (("resources/mathjax-27") (assoc-ref inputs "mathjax"))) | 135 | (("resources/mathjax-27") (assoc-ref inputs "mathjax"))) |
| 132 | (substitute* "src/cpp/session/include/session/SessionConstants.hpp" | 136 | (substitute* "src/cpp/session/include/session/SessionConstants.hpp" |
| @@ -201,6 +205,7 @@ for assistive technology like screen readers.") | |||
| 201 | #t))))) | 205 | #t))))) |
| 202 | (native-inputs | 206 | (native-inputs |
| 203 | `(("unzip" ,unzip) | 207 | `(("unzip" ,unzip) |
| 208 | ("catch2" ,catch2) | ||
| 204 | ;; gwt-components are built using ant | 209 | ;; gwt-components are built using ant |
| 205 | ("ant" ,ant) | 210 | ("ant" ,ant) |
| 206 | ("jdk" ,openjdk11 "jdk") | 211 | ("jdk" ,openjdk11 "jdk") |
