nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Use package-elisp-from-package for clangs emacs lisp files 

Use package-elisp-from-package for emacs-clang-format and emacs-clang-rename.
Also remove package-from-clang-elisp-file as it is not needed anymore.

* gnu/packages/llvm.scm (emacs-clang-format): Use package-elisp-from-package
* gnu/packages/llvm.scm (emacs-clang-rename): Use package-elisp-from-package
* gnu/packages/llvm.scm (package-from-clang-elisp-file): Remove function
This commit is contained in:
Tim Gesthuizen 2019-01-04 22:34:56 +01:00 committed by Pierre Neidhardt
parent 7d5856bd45
commit 5bc2e14add
No known key found for this signature in database
GPG Key ID: 9BDCF497A4BBCC7F
1 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
gnu/packages/llvm.scm
View File

@ -8,7 +8,7 @@
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de> ;;; Copyright © 2018, 2019 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -39,6 +39,7 @@
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages bootstrap) ;glibc-dynamic-linker #:use-module (gnu packages bootstrap) ;glibc-dynamic-linker
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages emacs)
#:use-module (gnu packages libffi) #:use-module (gnu packages libffi)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages python) #:use-module (gnu packages python)
@ -481,22 +482,21 @@ code analysis tools.")
(define-public emacs-clang-format (define-public emacs-clang-format
(package (package
(inherit clang) (inherit (package-elisp-from-package
(name "emacs-clang-format") clang
(build-system emacs-build-system) "emacs-clang-format"
(inputs '("tools/clang-format/clang-format.el")))
`(("clang" ,clang))) (inputs `(("clang" ,clang)))
(arguments (arguments `(#:phases
`(#:phases (modify-phases %standard-phases
(modify-phases %standard-phases (add-after 'unpack 'configure
(add-after 'unpack 'configure (lambda* (#:key inputs #:allow-other-keys)
(lambda* (#:key inputs #:allow-other-keys) (chmod "clang-format.el" #o644)
(let ((clang (assoc-ref inputs "clang"))) (emacs-substitute-variables "clang-format.el"
(copy-file "tools/clang-format/clang-format.el" "clang-format.el") ("clang-format-executable"
(emacs-substitute-variables "clang-format.el" (string-append (assoc-ref inputs "clang")
("clang-format-executable" "/bin/clang-format")))
(string-append clang "/bin/clang-format")))) #t)))))
#t)))))
(synopsis "Format code using clang-format") (synopsis "Format code using clang-format")
(description "This package allows to filter code through @code{clang-format} (description "This package allows to filter code through @code{clang-format}
to fix its formatting. @code{clang-format} is a tool that formats to fix its formatting. @code{clang-format} is a tool that formats
@ -505,22 +505,21 @@ C/C++/Obj-C code according to a set of style options, see
(define-public emacs-clang-rename (define-public emacs-clang-rename
(package (package
(inherit clang) (inherit (package-elisp-from-package
(name "emacs-clang-rename") clang
(build-system emacs-build-system) "emacs-clang-rename"
(inputs '("tools/clang-rename/clang-rename.el")))
`(("clang" ,clang))) (inputs `(("clang" ,clang)))
(arguments (arguments `(#:phases
`(#:phases (modify-phases %standard-phases
(modify-phases %standard-phases (add-after 'unpack 'configure
(add-after 'unpack 'configure (lambda* (#:key inputs #:allow-other-keys)
(lambda* (#:key inputs #:allow-other-keys) (chmod "clang-rename.el" #o644)
(let ((clang (assoc-ref inputs "clang"))) (emacs-substitute-variables "clang-rename.el"
(copy-file "tools/clang-rename/clang-rename.el" "clang-rename.el") ("clang-rename-binary"
(emacs-substitute-variables "clang-rename.el" (string-append (assoc-ref inputs "clang")
("clang-rename-binary" "/bin/clang-rename")))
(string-append clang "/bin/clang-rename")))) #t)))))
#t)))))
(synopsis "Rename every occurrence of a symbol using clang-rename") (synopsis "Rename every occurrence of a symbol using clang-rename")
(description "This package renames every occurrence of a symbol at point (description "This package renames every occurrence of a symbol at point
using @code{clang-rename}."))) using @code{clang-rename}.")))