summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Brielmaier <jonathan.brielmaier@web.de>2023-12-29 00:34:06 +0100
committerJonathan Brielmaier <jonathan.brielmaier@web.de>2023-12-29 00:46:48 +0100
commit0f355661044affec8532380fff6d5f027fbd899a (patch)
tree595a4d56532a7f011f8700d7b052b0c4c28c11a7
parent13114fa36da9cac4d14b7fc559ec6731d98cb443 (diff)
nongnu: clj-kondo: Fix build.
The new unpack-binary phase seems to not harmonize with patchelf always: https://gitlab.com/nonguix/nonguix/-/merge_requests/336#note_1709385147 * nongnu/packages/clojure.scm (clj-kondo)[arguments]: Delete 'binary-unpack phase for now and change style to gexp. [native-inputs]: change style to gexp. [inputs]: dito.
-rw-r--r--nongnu/packages/clojure.scm24
1 files changed, 12 insertions, 12 deletions
diff --git a/nongnu/packages/clojure.scm b/nongnu/packages/clojure.scm
index 6b94616..25170ed 100644
--- a/nongnu/packages/clojure.scm
+++ b/nongnu/packages/clojure.scm
@@ -2,6 +2,7 @@
2;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> 2;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
3;;; Copyright © 2020 Jelle Licht <jlicht@fsfe.org> 3;;; Copyright © 2020 Jelle Licht <jlicht@fsfe.org>
4;;; Copyright © 2020 Alex Griffin <a@ajgrf.com> 4;;; Copyright © 2020 Alex Griffin <a@ajgrf.com>
5;;; Copyright © 2023 Jonathan Brielmaier <jonathan.brielmaier@web.de>
5 6
6(define-module (nongnu packages clojure) 7(define-module (nongnu packages clojure)
7 #:use-module (gnu packages compression) 8 #:use-module (gnu packages compression)
@@ -11,6 +12,7 @@
11 #:use-module (guix build-system gnu) 12 #:use-module (guix build-system gnu)
12 #:use-module (guix build-system trivial) 13 #:use-module (guix build-system trivial)
13 #:use-module (guix download) 14 #:use-module (guix download)
15 #:use-module (guix gexp)
14 #:use-module (guix git-download) 16 #:use-module (guix git-download)
15 #:use-module (guix packages) 17 #:use-module (guix packages)
16 #:use-module (nonguix build-system binary) 18 #:use-module (nonguix build-system binary)
@@ -96,20 +98,18 @@ lets you focus on your code.")
96 "1zb4bkmhv5mh18z8h82qa1a0m95pd5dwdxg31pqgs6lnlca3vsph")))) 98 "1zb4bkmhv5mh18z8h82qa1a0m95pd5dwdxg31pqgs6lnlca3vsph"))))
97 (build-system binary-build-system) 99 (build-system binary-build-system)
98 (arguments 100 (arguments
99 `(#:patchelf-plan 101 (list #:patchelf-plan `'(("clj-kondo" ("gcc" "zlib")))
100 '(("clj-kondo" ("gcc:lib" "zlib"))) 102 #:install-plan `'(("clj-kondo" "/bin/"))
101 #:install-plan 103 #:phases #~(modify-phases %standard-phases
102 '(("clj-kondo" "/bin/")) 104 (delete 'binary-unpack)
103 #:phases 105 (add-after 'unpack 'chmod
104 (modify-phases %standard-phases 106 (lambda _
105 (add-after 'unpack 'chmod 107 (chmod "clj-kondo" #o755))))))
106 (lambda _
107 (chmod "clj-kondo" #o755))))))
108 (native-inputs 108 (native-inputs
109 `(("unzip" ,unzip))) 109 (list unzip))
110 (inputs 110 (inputs
111 `(("gcc:lib" ,gcc "lib") 111 (list `(,gcc "lib")
112 ("zlib" ,zlib))) 112 zlib))
113 (supported-systems '("x86_64-linux")) 113 (supported-systems '("x86_64-linux"))
114 (home-page "https://github.com/clj-kondo/clj-kondo") 114 (home-page "https://github.com/clj-kondo/clj-kondo")
115 (synopsis "Linter for Clojure code") 115 (synopsis "Linter for Clojure code")