diff options
| author | Jonathan Brielmaier <jonathan.brielmaier@web.de> | 2023-12-29 00:34:06 +0100 |
|---|---|---|
| committer | Jonathan Brielmaier <jonathan.brielmaier@web.de> | 2023-12-29 00:46:48 +0100 |
| commit | 0f355661044affec8532380fff6d5f027fbd899a (patch) | |
| tree | 595a4d56532a7f011f8700d7b052b0c4c28c11a7 /nongnu | |
| parent | 13114fa36da9cac4d14b7fc559ec6731d98cb443 (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.
Diffstat (limited to 'nongnu')
| -rw-r--r-- | nongnu/packages/clojure.scm | 24 |
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 @@ ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2020 Jelle Licht <jlicht@fsfe.org> ;;; Copyright © 2020 Alex Griffin <a@ajgrf.com> +;;; Copyright © 2023 Jonathan Brielmaier <jonathan.brielmaier@web.de> (define-module (nongnu packages clojure) #:use-module (gnu packages compression) @@ -11,6 +12,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (nonguix build-system binary) @@ -96,20 +98,18 @@ lets you focus on your code.") "1zb4bkmhv5mh18z8h82qa1a0m95pd5dwdxg31pqgs6lnlca3vsph")))) (build-system binary-build-system) (arguments - `(#:patchelf-plan - '(("clj-kondo" ("gcc:lib" "zlib"))) - #:install-plan - '(("clj-kondo" "/bin/")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'chmod - (lambda _ - (chmod "clj-kondo" #o755)))))) + (list #:patchelf-plan `'(("clj-kondo" ("gcc" "zlib"))) + #:install-plan `'(("clj-kondo" "/bin/")) + #:phases #~(modify-phases %standard-phases + (delete 'binary-unpack) + (add-after 'unpack 'chmod + (lambda _ + (chmod "clj-kondo" #o755)))))) (native-inputs - `(("unzip" ,unzip))) + (list unzip)) (inputs - `(("gcc:lib" ,gcc "lib") - ("zlib" ,zlib))) + (list `(,gcc "lib") + zlib)) (supported-systems '("x86_64-linux")) (home-page "https://github.com/clj-kondo/clj-kondo") (synopsis "Linter for Clojure code") |