@@ -1242,6 +1242,7 @@ (define-public stklos
(version "1.70")
(source (origin
(method url-fetch)
+ ;; TODO: Unbundle pcre, libgc, and libffi.
(uri (string-append "https://stklos.net/download/stklos-"
version ".tar.gz"))
(sha256
@@ -1254,22 +1255,18 @@ (define-public stklos
,@%gnu-build-system-modules)
#:phases
#~(modify-phases %standard-phases
- (add-before 'configure 'patch-sh-paths
+ (add-before 'configure 'patch-sh-references
(lambda* (#:key inputs #:allow-other-keys)
- (let ((bash-bin (search-input-file inputs "/bin/bash")))
+ (let ((bash (which "bash")))
(substitute* "configure"
- (("/bin/sh") bash-bin)))))
- (add-after 'configure 'patch-rm-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((rm-bin (search-input-file inputs "/bin/rm")))
- (ftw "."
- (lambda (filename stat-info f)
- (when (and
- (equal? f 'regular)
- (string=? (basename filename) "Makefile"))
- (substitute* filename
- (("/bin/rm") rm-bin)))
- #t))))))))
+ (("/bin/sh") bash)))))
+ (add-after 'configure 'patch-rm-references
+ (lambda _
+ (let ((rm (which "rm")))
+ (substitute* (find-files "." "^Makefile$")
+ (("/bin/rm") rm))))))))
+ (properties
+ '((release-monitoring-url . "https://stklos.net/download.html")))
(home-page "https://stklos.net")
(synopsis "R7RS Scheme with CLOS-like object system")
(description
@@ -1278,4 +1275,4 @@ (define-public stklos
as well as light. The implementation is based on an ad-hoc Virtual
Machine. STklos can also be compiled as a library and embedded in an
application.")
- (license gpl2)))
+ (license gpl2+)))