gnu: git: Add GIT_EXEC_PATH search-path-specification.

Enables git plugins to be found when in they're in the system profile.

* gnu/packages/version-control.scm (git)[native-search-paths]: Add
  GIT_EXEC_PATH.  Remove git wrapper and outdated comment.
This commit is contained in:
David Craven 2017-02-10 12:21:08 +01:00
parent 72524ae843
commit 82de2655a1
No known key found for this signature in database
GPG Key ID: 33B9E9FDE28D2C23
1 changed files with 5 additions and 11 deletions

View File

@ -275,16 +275,7 @@ as well as the classic centralized workflow.")
(wrap-program git-sm (wrap-program git-sm
`("PATH" ":" prefix `("PATH" ":" prefix
(,(string-append (assoc-ref inputs "perl") (,(string-append (assoc-ref inputs "perl")
"/bin")))) "/bin")))))))
;; Tell 'git' to look for core programs in the user's profile.
;; This allows user to install other outputs of this package and
;; have them transparently taken into account. There's a
;; 'GIT_EXEC_PATH' environment variable, but it's supposed to
;; specify a single directory, not a search path.
(wrap-program (string-append out "/bin/git")
`("PATH" ":" prefix
("$HOME/.guix-profile/libexec/git-core"))))))
(add-after 'split 'install-man-pages (add-after 'split 'install-man-pages
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -301,7 +292,10 @@ as well as the classic centralized workflow.")
(list (search-path-specification (list (search-path-specification
(variable "GIT_SSL_CAINFO") (variable "GIT_SSL_CAINFO")
(file-type 'regular) (file-type 'regular)
(files '("etc/ssl/certs/ca-certificates.crt"))))) (files '("etc/ssl/certs/ca-certificates.crt")))
(search-path-specification
(variable "GIT_EXEC_PATH")
(files '("libexec/git-core")))))
(synopsis "Distributed version control system") (synopsis "Distributed version control system")
(description (description