diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-06-30 16:46:37 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-07-02 01:06:31 +0200 |
| commit | 3730e3c64e2bc9b444281a17282aa7406e20d093 (patch) | |
| tree | d0d4877087fad23329d2241e085c36a1f93e98d9 /gnu/packages/commencement.scm | |
| parent | f16a866f74f39e2ae6ad708669fa2c4bc209c09b (diff) | |
| download | guix-patches-3730e3c64e2bc9b444281a17282aa7406e20d093.tar guix-patches-3730e3c64e2bc9b444281a17282aa7406e20d093.tar.gz | |
gnu: gettext: Update to 0.20.1.
* gnu/packages/gettext.scm (gettext-minimal): Update to 0.20.1.
[source](snippet): Remove.
[inputs]: Remove EXPAT. Add LIBUNISTRING, LIBXML2, and NCURSES.
[arguments]: Add #:configure-flags and a "patch-fixed-paths" phase. Delete
"link-expat" phase.
* gnu/packages/commencement.scm (gettext-boot0): Stay on version 0.19.8.1.
[arguments]: Adjust accordingly.
Co-authored-by: Miguel <rosen644835@gmail.com>
Diffstat (limited to 'gnu/packages/commencement.scm')
| -rw-r--r-- | gnu/packages/commencement.scm | 47 |
1 files changed, 25 insertions, 22 deletions
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 10b0bd67f5..1db28498ff 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2015,30 +2015,33 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (let ((gettext-minimal (package (inherit gettext-minimal) (name "gettext-boot0") + ;; Newer versions of GNU gettext depends on libxml2 and ncurses. To + ;; simplify the dependency chain, we stick to this version here. + (version "0.19.8.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gettext/gettext-" + version ".tar.gz")) + (sha256 + (base32 + "0hsw28f9q9xaggjlsdp2qmbp2rbd1mp0njzan2ld9kiqwkq2m57z")))) (inputs '()) ;zero dependencies (arguments - (substitute-keyword-arguments - `(#:tests? #f - ,@(package-arguments gettext-minimal)) - ((#:phases phases) - `(modify-phases ,phases - ;; Build only the tools. - (add-after 'unpack 'chdir - (lambda _ - (chdir "gettext-tools") - #t)) - - ;; Some test programs require pthreads, which we don't have. - (add-before 'configure 'no-test-programs - (lambda _ - (substitute* "tests/Makefile.in" - (("^PROGRAMS =.*$") - "PROGRAMS =\n")) - #t)) - - ;; Don't try to link against libexpat. - (delete 'link-expat) - (delete 'patch-tests)))))))) + `(#:tests? #f + #:phases (modify-phases %standard-phases + ;; Build only the tools. + (add-after 'unpack 'chdir + (lambda _ + (chdir "gettext-tools") + #t)) + + ;; Some test programs require pthreads, which we don't have. + (add-before 'configure 'no-test-programs + (lambda _ + (substitute* "tests/Makefile.in" + (("^PROGRAMS =.*$") + "PROGRAMS =\n")) + #t)))))))) (package-with-bootstrap-guile (package-with-explicit-inputs gettext-minimal %boot1-inputs |