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

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

This reverts commit 5bc2e14add.
This commit is contained in:
Pierre Neidhardt 2019-01-07 14:58:40 +01:00
parent 6fd2ed23ac
commit 3a3d4d9d54
No known key found for this signature in database
GPG Key ID: 9BDCF497A4BBCC7F
1 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
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, 2019 Tim Gesthuizen <tim.gesthuizen@yahoo.de> ;;; Copyright © 2018 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,7 +39,6 @@
#: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)
@ -482,20 +481,21 @@ code analysis tools.")
(define-public emacs-clang-format (define-public emacs-clang-format
(package (package
(inherit (package-elisp-from-package (inherit clang)
clang (name "emacs-clang-format")
"emacs-clang-format" (build-system emacs-build-system)
'("tools/clang-format/clang-format.el"))) (inputs
(inputs `(("clang" ,clang))) `(("clang" ,clang)))
(arguments `(#:phases (arguments
`(#: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")))
(copy-file "tools/clang-format/clang-format.el" "clang-format.el")
(emacs-substitute-variables "clang-format.el" (emacs-substitute-variables "clang-format.el"
("clang-format-executable" ("clang-format-executable"
(string-append (assoc-ref inputs "clang") (string-append clang "/bin/clang-format"))))
"/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}
@ -505,20 +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 (package-elisp-from-package (inherit clang)
clang (name "emacs-clang-rename")
"emacs-clang-rename" (build-system emacs-build-system)
'("tools/clang-rename/clang-rename.el"))) (inputs
(inputs `(("clang" ,clang))) `(("clang" ,clang)))
(arguments `(#:phases (arguments
`(#: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")))
(copy-file "tools/clang-rename/clang-rename.el" "clang-rename.el")
(emacs-substitute-variables "clang-rename.el" (emacs-substitute-variables "clang-rename.el"
("clang-rename-binary" ("clang-rename-binary"
(string-append (assoc-ref inputs "clang") (string-append clang "/bin/clang-rename"))))
"/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