diff options
author | Ludovic Courtès <ludo@gnu.org> | 2013-11-23 22:30:10 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2013-11-23 22:30:10 +0100 |
commit | 53c85e97dcc264da5ff5cd4e3be4d47028f4d726 (patch) | |
tree | 8984fefeb61e0c165bf960fdfa3cd11355d02ba3 /gnu/packages/maths.scm | |
parent | 2e838890ff989128e8a78eea574d1ad158dd6361 (diff) | |
parent | c320011da5e743f47220f380c818e95394f6d9c0 (diff) | |
download | guix-patches-53c85e97dcc264da5ff5cd4e3be4d47028f4d726.tar guix-patches-53c85e97dcc264da5ff5cd4e3be4d47028f4d726.tar.gz |
Merge branch 'core-updates'
Conflicts:
gnu/packages/gnunet.scm
Diffstat (limited to 'gnu/packages/maths.scm')
-rw-r--r-- | gnu/packages/maths.scm | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 9b2b052a52..c1c78d5ce3 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -26,9 +26,10 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (gnu packages compression) - #:use-module ((gnu packages gettext) - #:renamer (symbol-prefix-proc 'gnu:)) + #:use-module (gnu packages fontutils) + #:use-module (gnu packages gettext) #:use-module (gnu packages gcc) + #:use-module (gnu packages gtk) #:use-module (gnu packages multiprecision) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -132,12 +133,16 @@ LP/MIP solver is included in the package.") version ".tar.gz")) (sha256 (base32 - "0qhxsdbwxd3cn1shc13wxvx2lg32lp4z6sz24kv3jz7p5xfi8j7x")))) + "0qhxsdbwxd3cn1shc13wxvx2lg32lp4z6sz24kv3jz7p5xfi8j7x")) + (patches (list (search-patch "pspp-tests.patch"))))) (build-system gnu-build-system) (inputs - `(("gettext" ,gnu:gettext) + `(("cairo" ,cairo) + ("fontconfig" ,fontconfig) + ("gettext" ,gnu-gettext) ("gsl" ,gsl) ("libxml2" ,libxml2) + ("pango" ,pango) ("readline" ,readline) ("zlib" ,zlib))) (native-inputs @@ -145,8 +150,7 @@ LP/MIP solver is included in the package.") ("pkg-config" ,pkg-config))) (arguments `(#:configure-flags - `("--without-cairo" ; FIXME: tests currently fail for lack of font - "--without-gui"))) ; FIXME: package missing dependencies + `("--without-gui"))) ; FIXME: package missing dependencies (home-page "http://www.gnu.org/software/pspp/") (synopsis "Statistical analysis") (description |