diff options
| author | Leo Famulari <leo@famulari.name> | 2017-07-23 03:42:12 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-07-23 03:42:12 -0400 |
| commit | 6c1a317e29c45e85e3a0e050612cdefe470b100c (patch) | |
| tree | e65dedf933090b1a9f8398655b3b20eba49fae96 /gnu/packages/guile.scm | |
| parent | b7158b767b7fd9f0379dfe08083c48a0cf0f3d50 (diff) | |
| parent | 9478c05955643f8ff95dabccc1e42b20abb88049 (diff) | |
| download | gnu-guix-6c1a317e29c45e85e3a0e050612cdefe470b100c.tar gnu-guix-6c1a317e29c45e85e3a0e050612cdefe470b100c.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/guile.scm')
| -rw-r--r-- | gnu/packages/guile.scm | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index d077ae992a..0d1989e524 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2017 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2017 David Thompson <davet@gnu.org> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> +;;; Copyright © 2017 Theodoros Foradis <theodoros.for@openmailbox.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -530,6 +531,13 @@ many readers as needed).") library.") (license license:lgpl3+))) +(define-public guile-ncurses/gpm + (package + (inherit guile-ncurses) + (name "guile-ncurses-with-gpm") + (inputs `(("ncurses" ,ncurses/gpm) + ("guile" ,guile-2.2))))) + (define-public mcron (package (name "mcron") @@ -1350,20 +1358,21 @@ capabilities.") (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs - `(("guile" ,guile-2.0) + `(("guile" ,guile-2.2) ("guile-lib" ,guile-lib))) (inputs `(("libffi" ,libffi))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'pre-configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* (find-files "." "^Makefile.in$") - (("guilemoduledir =.*guile/site" all) - (string-append all "/2.0"))) - #t)))))) + `(#:configure-flags '("--disable-Werror") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'pre-configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* (find-files "." "^Makefile.in$") + (("guilemoduledir =.*guile/site" all) + (string-append all "/@GUILE_EFFECTIVE_VERSION@"))) + #t)))))) (synopsis "Generate C bindings for Guile") (description "G-Wrap is a tool and Guile library for generating function wrappers for inter-language calls. It currently only supports generating Guile |