diff options
Diffstat (limited to 'gnu/packages/gettext.scm')
| -rw-r--r-- | gnu/packages/gettext.scm | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index 07d2b0d8cb..6b056055b8 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -17,26 +17,42 @@ ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. (define-module (gnu packages gettext) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:select (gpl3)) #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module (gnu packages xml)) -(define-public gettext +;; Use that name to avoid clashes with Guile's 'gettext' procedure. +;; +;; We used to resort to #:renamer on the user side, but that prevented +;; circular dependencies involving (gnu packages gettext). This is because +;; 'resolve-interface' (as of Guile 2.0.9) iterates eagerly over the used +;; module when there's a #:renamer, and that module may be empty at that point +;; in case or circular dependencies. +(define-public gnu-gettext (package (name "gettext") - (version "0.18.3") + (version "0.18.3.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gettext/gettext-" version ".tar.gz")) (sha256 (base32 - "0j7rp56c61j4k1bz1xdc041hzv7186yyzhbp95fmc0zq7l2c3wrn")))) + "0p940zmmw1lndvdhck2vrazikjhr02affwy47mmpfxqvacrrm3qd")))) (build-system gnu-build-system) + (inputs + `(("expat" ,expat))) (arguments `(#:phases (alist-cons-before + 'configure 'link-expat + (lambda _ + (substitute* "gettext-tools/configure" + (("LIBEXPAT=\"-ldl\"") "LIBEXPAT=\"-ldl -lexpat\"") + (("LTLIBEXPAT=\"-ldl\"") "LTLIBEXPAT=\"-ldl -lexpat\""))) + (alist-cons-before 'check 'patch-tests (lambda* (#:key inputs #:allow-other-keys) (let ((bash (which "sh"))) @@ -48,7 +64,7 @@ "posix_spawn") (("/bin/sh") bash)))) - %standard-phases))) + %standard-phases)))) (home-page "http://www.gnu.org/software/gettext/") (synopsis "Tools and documentation for translation") (description |