guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: git: Fix gitweb.


From: Ricardo Wurmus
Subject: 01/01: gnu: git: Fix gitweb.
Date: Sat, 3 Dec 2016 19:12:31 +0000 (UTC)

rekado pushed a commit to branch master
in repository guix.

commit 3bec8a016ff61e3e5dd1af86ee8423af4c168720
Author: Ricardo Wurmus <address@hidden>
Date:   Sat Dec 3 12:46:25 2016 +0100

    gnu: git: Fix gitweb.
    
    * gnu/packages/version-control.scm (git)[inputs]: Add perl-cgi.
    [arguments]: Wrap "gitweb.cgi" with PERL5LIB.
---
 gnu/packages/version-control.scm |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 03d7bbe..edd2d3a 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -141,6 +141,9 @@ as well as the classic centralized workflow.")
       ("python" ,python-2) ; CAVEAT: incompatible with python-3 according to 
INSTALL
       ("zlib" ,zlib)
 
+      ;; For 'gitweb.cgi'
+      ("perl-cgi" ,perl-cgi)
+
       ;; For 'git-svn'.
       ("subversion" ,subversion)
       ("perl-term-readkey" ,perl-term-readkey)
@@ -257,6 +260,17 @@ as well as the classic centralized workflow.")
                                    "perl-net-smtp-ssl"
                                    "perl-io-socket-ssl")))))))
 
+              ;; Tell 'gitweb.cgi' where perl modules are.
+              (wrap-program (string-append out "/share/gitweb/gitweb.cgi")
+                `("PERL5LIB" ":" prefix
+                  ,(map (lambda (o) (string-append o "/lib/perl5/site_perl"))
+                        (list
+                         ,@(transitive-input-references
+                            'inputs
+                            (map (lambda (l)
+                                   (assoc l (inputs)))
+                                 '("perl-cgi")))))))
+
               ;; Tell 'git-submodule' where Perl is.
               (wrap-program git-sm
                 `("PATH" ":" prefix



reply via email to

[Prev in Thread] Current Thread [Next in Thread]