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.
This commit is contained in:
Jonathan Brielmaier 2023-12-29 00:34:06 +01:00
parent 13114fa36d
commit 0f35566104
No known key found for this signature in database
GPG key ID: ECFC83988B4E4B9F

View file

@ -2,6 +2,7 @@
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 Jelle Licht <jlicht@fsfe.org> ;;; Copyright © 2020 Jelle Licht <jlicht@fsfe.org>
;;; Copyright © 2020 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2020 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2023 Jonathan Brielmaier <jonathan.brielmaier@web.de>
(define-module (nongnu packages clojure) (define-module (nongnu packages clojure)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
@ -11,6 +12,7 @@
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (nonguix build-system binary) #:use-module (nonguix build-system binary)
@ -96,20 +98,18 @@ lets you focus on your code.")
"1zb4bkmhv5mh18z8h82qa1a0m95pd5dwdxg31pqgs6lnlca3vsph")))) "1zb4bkmhv5mh18z8h82qa1a0m95pd5dwdxg31pqgs6lnlca3vsph"))))
(build-system binary-build-system) (build-system binary-build-system)
(arguments (arguments
`(#:patchelf-plan (list #:patchelf-plan `'(("clj-kondo" ("gcc" "zlib")))
'(("clj-kondo" ("gcc:lib" "zlib"))) #:install-plan `'(("clj-kondo" "/bin/"))
#:install-plan #:phases #~(modify-phases %standard-phases
'(("clj-kondo" "/bin/")) (delete 'binary-unpack)
#:phases (add-after 'unpack 'chmod
(modify-phases %standard-phases (lambda _
(add-after 'unpack 'chmod (chmod "clj-kondo" #o755))))))
(lambda _
(chmod "clj-kondo" #o755))))))
(native-inputs (native-inputs
`(("unzip" ,unzip))) (list unzip))
(inputs (inputs
`(("gcc:lib" ,gcc "lib") (list `(,gcc "lib")
("zlib" ,zlib))) zlib))
(supported-systems '("x86_64-linux")) (supported-systems '("x86_64-linux"))
(home-page "https://github.com/clj-kondo/clj-kondo") (home-page "https://github.com/clj-kondo/clj-kondo")
(synopsis "Linter for Clojure code") (synopsis "Linter for Clojure code")