diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2017-03-13 23:08:49 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2017-03-13 23:08:49 +0200 |
| commit | 3f9543aee1e49001d0f80542dd71ba73c44787c7 (patch) | |
| tree | 50ee1bdd53b1e5ec69cb8655f23da79c332dde1e /gnu/packages/lisp.scm | |
| parent | 864a9590ad948df09f2ad6e9e929608a7587a5f7 (diff) | |
| parent | a71c863834448e2645518b31b60a96ef488dd761 (diff) | |
| download | patches-3f9543aee1e49001d0f80542dd71ba73c44787c7.tar patches-3f9543aee1e49001d0f80542dd71ba73c44787c7.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/lisp.scm')
| -rw-r--r-- | gnu/packages/lisp.scm | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 647c64dcc7..425c273e0d 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -129,7 +129,7 @@ interface to the Tk widget system.") (define-public ecl (package (name "ecl") - (version "16.1.2") + (version "16.1.3") (source (origin (method url-fetch) @@ -137,7 +137,7 @@ interface to the Tk widget system.") "https://common-lisp.net/project/ecl/static/files/release/" name "-" version ".tgz")) (sha256 - (base32 "16ab8qs3awvdxy8xs8jy82v8r04x4wr70l9l2j45vgag18d2nj1d")) + (base32 "0m0j24w5d5a9dwwqyrg0d35c0nys16ijb4r0nyk87yp82v38b9bn")) (modules '((guix build utils))) (snippet ;; Add ecl-bundle-systems to 'default-system-source-registry'. @@ -152,9 +152,6 @@ interface to the Tk widget system.") ("libffi" ,libffi))) (arguments '(#:tests? #t - #:make-flags `(,(string-append "ECL=" - (assoc-ref %outputs "out") - "/bin/ecl")) #:parallel-tests? #f #:phases (modify-phases %standard-phases @@ -182,7 +179,12 @@ interface to the Tk widget system.") `("kernel-headers" ,@libraries))) `("LIBRARY_PATH" suffix ,library-directories) `("LD_LIBRARY_PATH" suffix ,library-directories))))) - (add-after 'wrap 'check (assoc-ref %standard-phases 'check))))) + (add-after 'wrap 'check (assoc-ref %standard-phases 'check)) + (add-before 'check 'fix-path-to-ecl + (lambda _ + (substitute* "build/tests/Makefile" + (("\\$\\{exec_prefix\\}/") "")) + #t))))) (native-search-paths (list (search-path-specification (variable "XDG_DATA_DIRS") |