summary refs log tree commit diff
diff options
context:
space:
mode:
authorgnidorah <gnidorah@users.noreply.github.com>2018-03-28 12:27:19 +0300
committergnidorah <gnidorah@users.noreply.github.com>2018-03-29 16:46:11 +0300
commit05b535c850d1361e18ecd58ba81a8537bf31041b (patch)
treee1e03ebd7a7f4e5f6f5cebc80c5288ebece51be8
parent2821d3fed74a209c8771402ce8058fd4188357ad (diff)
downloadnixpkgs-05b535c850d1361e18ecd58ba81a8537bf31041b.tar
nixpkgs-05b535c850d1361e18ecd58ba81a8537bf31041b.tar.gz
nixpkgs-05b535c850d1361e18ecd58ba81a8537bf31041b.tar.bz2
nixpkgs-05b535c850d1361e18ecd58ba81a8537bf31041b.tar.lz
nixpkgs-05b535c850d1361e18ecd58ba81a8537bf31041b.tar.xz
nixpkgs-05b535c850d1361e18ecd58ba81a8537bf31041b.tar.zst
nixpkgs-05b535c850d1361e18ecd58ba81a8537bf31041b.zip
git: add more deps to gitweb
-rw-r--r--nixos/modules/services/web-servers/nginx/gitweb.nix10
-rw-r--r--pkgs/applications/version-management/git-and-tools/default.nix2
2 files changed, 1 insertions, 11 deletions
diff --git a/nixos/modules/services/web-servers/nginx/gitweb.nix b/nixos/modules/services/web-servers/nginx/gitweb.nix
index 068bf5593e9..344c1f7b8aa 100644
--- a/nixos/modules/services/web-servers/nginx/gitweb.nix
+++ b/nixos/modules/services/web-servers/nginx/gitweb.nix
@@ -4,16 +4,6 @@ with lib;
 
 let
   cfg = config.services.gitweb;
-  gitwebPerlLibs = with pkgs.perlPackages; [ CGIFast FCGI FCGIProcManager HTMLTagCloud ];
-  git = pkgs.git.overrideAttrs (oldAttrs: rec {
-    postInstall = ''
-      ${oldAttrs.postInstall}
-      for p in ${lib.concatStringsSep " " gitwebPerlLibs}; do
-          sed -i -e "/use CGI /i use lib \"$p/lib/perl5/site_perl\";" \
-              "$out/share/gitweb/gitweb.cgi"
-      done
-    '';
-  });
 
 in
 {
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index e5e36e998ac..e2c525963d2 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -15,7 +15,7 @@ let
       perlPackages.MIMEBase64 perlPackages.AuthenSASL
       perlPackages.DigestHMAC
     ];
-    gitwebPerlLibs = with perlPackages; [ CGI HTMLParser ];
+    gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
   };
 
 in