From e3f538969ef250b5a4a720834f9f6e54aaf72a19 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 12 Dec 2020 10:33:37 +0800 Subject: gnu: ecl: Return #t in wrap phase. * gnu/packages/lisp.scm (ecl)[arguments]: In phase "wrap", return #t. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 3d446290a7..4592724867 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -280,7 +280,8 @@ interface to the Tk widget system.") (input-path lib "/include")) `("kernel-headers" ,@libraries))) `("LIBRARY_PATH" suffix ,library-directories) - `("LD_LIBRARY_PATH" suffix ,library-directories))))) + `("LD_LIBRARY_PATH" suffix ,library-directories)) + #t))) (add-after 'wrap 'check (assoc-ref %standard-phases 'check)) (add-before 'check 'fix-path-to-ecl (lambda _ -- cgit v1.2.3 From 20a964149cd51d06f3560287126111490a502581 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 12 Dec 2020 10:34:37 +0800 Subject: gnu: ecl: Remove build-stamp to improve reproducibility. * gnu/packages/lisp.scm (ecl)[arguments]: Add "remove-build-stamp" phase. Move "wrap" phase after "remove-build-stamp" phase. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 4592724867..f250e8804b 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2019 Jesse Gildersleve ;;; Copyright © 2019, 2020 Guillaume Le Vaillant ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -258,7 +259,12 @@ interface to the Tk widget system.") (contrib-asdf "contrib/asdf/asdf.lisp")) (copy-file guix-asdf contrib-asdf)) #t)) - (add-after 'install 'wrap + (add-after 'install 'remove-build-stamp + (lambda* (#:key outputs #:allow-other-keys) + (delete-file (string-append (assoc-ref outputs "out") + "/lib/ecl-" ,version "/build-stamp")) + #t)) + (add-after 'remove-build-stamp 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((ecl (assoc-ref outputs "out")) (input-path (lambda (lib path) -- cgit v1.2.3