diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-31 01:30:15 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-31 01:34:58 +0200 |
commit | 55932c1beca26c7b5b7c259d95f6eb80644150a7 (patch) | |
tree | a2faafd73c3dcda7418278961a6ddf41d6d33d5c /pkgs/applications/version-management/bazaar | |
parent | 23562aad59048e8e1202e618fcf402079f1593b8 (diff) |
Don't statically depend on cacert for certificates
This reverts commit cd52c044568bdf1108428698048a9af92dc0b625 and others. Managing certificates (including revoking certificates and adding custom certificates) becomes extremely painful if every package in the system potentially depends on a different copy of cacert. Also, it makes updating cacert rather expensive.
Diffstat (limited to 'pkgs/applications/version-management/bazaar')
-rw-r--r-- | pkgs/applications/version-management/bazaar/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index c3b238eeb0aa6..28406cecbb00f 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, cacert }: +{ stdenv, fetchurl, pythonPackages }: stdenv.mkDerivation rec { version = "2.6"; @@ -19,10 +19,9 @@ stdenv.mkDerivation rec { patches = [ ./add_certificates.patch ]; postPatch = '' substituteInPlace bzrlib/transport/http/_urllib2_wrappers.py \ - --subst-var-by "certPath" "${cacert}/etc/ssl/certs/ca-bundle.crt" + --subst-var-by certPath /etc/ssl/certs/ca-certificates.crt ''; - installPhase = '' python setup.py install --prefix=$out wrapPythonPrograms |