summary refs log tree commit diff
path: root/pkgs/applications/version-management
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-06-05 13:00:52 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-06-05 13:00:52 -0700
commitffd0539eba473348f752fa8ab1f1f55388634f8f (patch)
treef7a7fcc8b0a71d3b323595bbf241886dbc31a023 /pkgs/applications/version-management
parent9176f73ceed438857e8c503a1a34fd0161db6297 (diff)
downloadnixpkgs-ffd0539eba473348f752fa8ab1f1f55388634f8f.tar
nixpkgs-ffd0539eba473348f752fa8ab1f1f55388634f8f.tar.gz
nixpkgs-ffd0539eba473348f752fa8ab1f1f55388634f8f.tar.bz2
nixpkgs-ffd0539eba473348f752fa8ab1f1f55388634f8f.tar.lz
nixpkgs-ffd0539eba473348f752fa8ab1f1f55388634f8f.tar.xz
nixpkgs-ffd0539eba473348f752fa8ab1f1f55388634f8f.tar.zst
nixpkgs-ffd0539eba473348f752fa8ab1f1f55388634f8f.zip
cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r--pkgs/applications/version-management/bazaar/default.nix2
-rw-r--r--pkgs/applications/version-management/mercurial/default.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix
index ad6f0c50a37..c3b238eeb0a 100644
--- a/pkgs/applications/version-management/bazaar/default.nix
+++ b/pkgs/applications/version-management/bazaar/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   patches = [ ./add_certificates.patch ];
   postPatch = ''
     substituteInPlace bzrlib/transport/http/_urllib2_wrappers.py \
-      --subst-var-by "certPath" "${cacert}/ca-bundle.crt"
+      --subst-var-by "certPath" "${cacert}/etc/ssl/certs/ca-bundle.crt"
   '';
 
 
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index dee2abd2b1f..2409e8e2240 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
       mkdir -p $out/etc/mercurial
       cat >> $out/etc/mercurial/hgrc << EOF
       [web]
-      cacerts = ${cacert}/ca-bundle.crt
+      cacerts = ${cacert}/etc/ssl/certs/ca-bundle.crt
       EOF
 
       # copy hgweb.cgi to allow use in apache