futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: magit: Use 'modify-phases'.

Browse Source 
* gnu/packages/emacs.scm (magit)[arguments]: Use 'modify-phases' instead
  of 'alist-cons-before' & co.
This commit is contained in:
Ludovic Courtès 2015-05-17 12:22:49 +02:00
parent 2f910ef68c
commit c466bfd1ac
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gnu/packages/emacs.scm
View File

@ -298,28 +298,28 @@ configuration files, such as .gitattributes, .gitignore, and .git/config.")
(guix build emacs-utils)) (guix build emacs-utils))
#:tests? #f ; no check target #:tests? #f ; no check target
#:phases #:phases
(alist-replace (modify-phases %standard-phases
'configure (replace
(lambda* (#:key outputs #:allow-other-keys) 'configure
(let ((out (assoc-ref outputs "out"))) (lambda* (#:key outputs #:allow-other-keys)
(substitute* "Makefile" (let ((out (assoc-ref outputs "out")))
(("/usr/local") out) (substitute* "Makefile"
(("/etc") (string-append out "/etc"))))) (("/usr/local") out)
(alist-cons-before (("/etc") (string-append out "/etc"))))))
'build 'patch-exec-paths (add-before
(lambda* (#:key inputs #:allow-other-keys) 'build 'patch-exec-paths
(let ((git (assoc-ref inputs "git")) (lambda* (#:key inputs #:allow-other-keys)
(git:gui (assoc-ref inputs "git:gui"))) (let ((git (assoc-ref inputs "git"))
(emacs-substitute-variables "magit.el" (git:gui (assoc-ref inputs "git:gui")))
("magit-git-executable" (string-append git "/bin/git")) (emacs-substitute-variables "magit.el"
("magit-gitk-executable" (string-append git:gui "/bin/gitk"))))) ("magit-git-executable" (string-append git "/bin/git"))
(alist-cons-after ("magit-gitk-executable" (string-append git:gui "/bin/gitk"))))))
(add-after
'install 'post-install 'install 'post-install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(emacs-generate-autoloads (emacs-generate-autoloads
,name (string-append (assoc-ref outputs "out") ,name (string-append (assoc-ref outputs "out")
"/share/emacs/site-lisp/"))) "/share/emacs/site-lisp/")))))))
%standard-phases)))))
(home-page "http://magit.github.io/") (home-page "http://magit.github.io/")
(synopsis "Emacs interface for the Git version control system") (synopsis "Emacs interface for the Git version control system")
(description (description