diff options
| author | Mathieu Lirzin <mthl@reuz.fr> | 2025-12-26 02:41:39 +0100 |
|---|---|---|
| committer | Hilton Chain <hako@ultrarare.space> | 2026-01-04 15:29:30 +0800 |
| commit | 14e1ab545a25546e7d6c481f8e2ffd66c11cddc7 (patch) | |
| tree | 8374096d23820c8bf7e3f3eaa2077f049014c28f /nongnu/packages | |
| parent | ed2c1815132c7435c26b0c875f72ac3a42fa2646 (diff) | |
nongnu: Fix babashka classpath extension mechanism.
* nongnu/packages/clojure.scm (babashka)[inputs]: Add openjdk and
babashka-clojure-tools.
[#:phases]<wrap-programs>: Wrap JAVA_HOME and DEPS_CLJ_TOOLS_DIR instead of
BABASHKA_CLASSPATH.
<validate-classpath>: Adapt to it.
Signed-off-by: Hilton Chain <hako@ultrarare.space>
Diffstat (limited to 'nongnu/packages')
| -rw-r--r-- | nongnu/packages/clojure.scm | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/nongnu/packages/clojure.scm b/nongnu/packages/clojure.scm index b668b14..7722cea 100644 --- a/nongnu/packages/clojure.scm +++ b/nongnu/packages/clojure.scm @@ -10,6 +10,7 @@ #:use-module (gnu packages clojure) #:use-module (gnu packages compression) #:use-module (gnu packages gcc) + #:use-module (gnu packages java) #:use-module (gnu packages readline) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) @@ -214,21 +215,19 @@ perform refactors and more.") (chmod "bb" #o755))) (add-after 'patch-shebangs 'wrap-programs (lambda _ - (let ((clojure-tools #$(this-package-input "clojure-tools"))) + (let ((openjdk #$(this-package-input "openjdk")) + (clojure-tools #$(this-package-input + "babashka-clojure-tools"))) (wrap-program (string-append #$output "/bin/bb") - `("BABASHKA_CLASSPATH" ":" suffix - ,(find-files clojure-tools "\\.jar$")))))) + `("DEPS_CLJ_TOOLS_DIR" = + ,(list (string-append clojure-tools "/lib/clojure"))) + `("JAVA_HOME" = ,(list openjdk)))))) (add-after 'validate-runpath 'validate-classpath (lambda _ - (call-with-temporary-output-file - (lambda (name port) - (display "{:deps {org.clojure/data.xml {:mvn/version \"1.1.0\"}}}" port) - (close port) - (unless (invoke (string-append #$output "/bin/bb") - "--config" name - "-e" "(System/exit 0)") - (error "Classpath error. See output."))))))))) - (inputs (list clojure-tools zlib)) + (let ((bb (string-append #$output "/bin/bb"))) + (and (invoke bb "-e" "(System/exit 0)") + (invoke bb "-e" "(+ 1 1)")))))))) + (inputs (list babashka-clojure-tools openjdk zlib)) (supported-systems '("x86_64-linux")) (home-page "https://github.com/babashka/babashka") (synopsis "Native, fast starting Clojure interpreter for scripting") |