From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: [PATCH] gnu: git: Fix gitweb. Date: Sat, 3 Dec 2016 12:58:51 +0100 Message-ID: <20161203115851.12830-1-rekado@elephly.net> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:34220) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cD8yq-0000wO-Ly for guix-devel@gnu.org; Sat, 03 Dec 2016 06:59:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cD8yl-0001LX-RT for guix-devel@gnu.org; Sat, 03 Dec 2016 06:59:48 -0500 Received: from sender163-mail.zoho.com ([74.201.84.163]:21472) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cD8yl-0001LD-JK for guix-devel@gnu.org; Sat, 03 Dec 2016 06:59:43 -0500 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * 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 -- 2.10.2