gnu: git: Do not retain reference from "out" to Subversion.
* gnu/packages/version-control.scm (git): Wrap 'git-svn', not 'git', for PERL5LIB and LD_LIBRARY_PATH.master
parent
29a2ccd384
commit
0a5a1db2d4
|
@ -125,16 +125,7 @@ from a command line or use a GUI application.")
|
||||||
(wrap-program git-svn*
|
(wrap-program git-svn*
|
||||||
`("PATH" ":" prefix
|
`("PATH" ":" prefix
|
||||||
(,(string-append (assoc-ref inputs "subversion")
|
(,(string-append (assoc-ref inputs "subversion")
|
||||||
"/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"))
|
|
||||||
`("PERL5LIB" ":" prefix
|
`("PERL5LIB" ":" prefix
|
||||||
(,(string-append (assoc-ref inputs "subversion")
|
(,(string-append (assoc-ref inputs "subversion")
|
||||||
"/lib/perl5/site_perl")))
|
"/lib/perl5/site_perl")))
|
||||||
|
@ -143,7 +134,16 @@ from a command line or use a GUI application.")
|
||||||
;; help it find 'libsvn_client-1.so'.
|
;; help it find 'libsvn_client-1.so'.
|
||||||
`("LD_LIBRARY_PATH" ":" prefix
|
`("LD_LIBRARY_PATH" ":" prefix
|
||||||
(,(string-append (assoc-ref inputs "subversion")
|
(,(string-append (assoc-ref inputs "subversion")
|
||||||
"/lib"))))))
|
"/lib"))))
|
||||||
|
|
||||||
|
;; 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")))))
|
||||||
%standard-phases))))
|
%standard-phases))))
|
||||||
(synopsis "Distributed version control system")
|
(synopsis "Distributed version control system")
|
||||||
(description
|
(description
|
||||||
|
|
Loading…
Reference in New Issue