diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-04-23 19:43:59 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-04-23 19:43:59 +0200 |
commit | 37da4fbe1562583589eeddb4be8e11bece80fd35 (patch) | |
tree | 4d8a454b27e62f9b8d7b0fe641a9f6aa6de2402c /gnu/packages/maths.scm | |
parent | 73326e742d82b6706333885eca770f7518636b1f (diff) | |
parent | e01bd1a67447c1f2a2b5b03e8ea8fbbccd2cd5bd (diff) | |
download | guix-37da4fbe1562583589eeddb4be8e11bece80fd35.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/maths.scm')
-rw-r--r-- | gnu/packages/maths.scm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 9bf5f03390..25de298d5a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2014 Mathieu Lirzin <mathieu.lirzin@openmailbox.org> ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> -;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015 Fabian Harfert <fhmgufs@web.de> ;;; Copyright © 2016 Roel Janssen <roel@gnu.org> @@ -2796,12 +2796,12 @@ to BMP, JPEG or PNG image formats.") ;; of Debian's Maxima package. ;; If Maxima can successfully run this, the binary to be installed ;; should be fine. - (zero? - (system - (string-append "./maxima-local " - "--lisp=gcl " - "--batch-string=\"run_testsuite();\" " - "| grep -q \"No unexpected errors found\""))))) + (invoke "sh" "-c" + (string-append + "./maxima-local " + "--lisp=gcl " + "--batch-string=\"run_testsuite();\" " + "| grep -q \"No unexpected errors found\"")))) ;; Make sure the doc and emacs files are found in the ;; standard location. Also configure maxima to find gnuplot ;; without having it on the PATH. |