tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

Revert "gnu: clojure-tools: Add coreutils-minimal and openjdk inputs."

Browse Source 
This reverts commit 1481959db7.

Change-Id: I9c05bb3575da3a45ee358ed5eacbd6e6e0a6885f
Signed-off-by: Andreas Enge <andreas@enge.fr>
This commit is contained in:
Mathieu Lirzin
2026-02-11 08:25:14 +01:00
committed by Andreas Enge
parent b657836863
commit 5bde01c062
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/clojure.scm
View File

@@ -24,8 +24,6 @@
(define-module (gnu packages clojure)
#:use-module (gnu packages)
#:use-module (gnu packages base)
#:use-module (gnu packages guile)
#:use-module (gnu packages java)
#:use-module (gnu packages maven)
#:use-module (guix gexp)
@@ -35,7 +33,8 @@
#:use-module (guix git-download)
#:use-module (guix build-system ant)
#:use-module (guix build-system copy)
#:use-module (guix build-system clojure))
#:use-module (guix build-system clojure)
#:use-module (ice-9 match))
(define-public clojure-spec-alpha
(package
@@ -406,30 +405,21 @@ designs.")
(substitute* "clj"
(("BINDIR") (string-append #$output "/bin")))
(substitute* "clojure"
(("PREFIX") (string-append #$output "/lib/clojure")))
(let ((coreutils #$(this-package-input "coreutils-minimal"))
(jre #$(this-package-input "openjdk")))
(wrap-script "clojure"
`("JAVA_HOME" = (,jre))
`("PATH" = (,(string-append coreutils "/bin")))))))
(("PREFIX") (string-append #$output "/lib/clojure")))))
(add-after 'fix-paths 'copy-tools-deps-alpha-jar
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "clojure"
(("\\$install_dir/libexec/clojure-tools-\\$version\\.jar")
(let* ((selected (assq-remove! inputs "openjdk"))
(input-dirs (map cdr selected))
(let* ((input-dirs (map cdr inputs))
(jars (apply append
(map (lambda (dir)
(find-files dir "\\.jar$"))
input-dirs))))
(string-join jars ":")))))))))
(inputs (list coreutils-minimal
clojure
(inputs (list clojure
clojure-tools-deps
guile-3.0/pinned
java-commons-logging-minimal
java-slf4j-nop
openjdk))
java-slf4j-nop))
(home-page "https://clojure.org/releases/tools")
(synopsis "CLI tools for the Clojure programming language")
(description "This package provides the @command{clojure} and