alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Fix ca-bundle paths

Browse source
This commit is contained in:
William A. Kennington III 2015-05-29 14:03:34 -07:00
parent d6cbb061e3
commit 14c1e0fa1f
13 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/networking/cluster/panamax/api/default.nix
View file

@ -62,8 +62,8 @@ stdenv.mkDerivation rec {
--prefix "PATH" : "$out/share/panamax-api/bin:${env.ruby}/bin:$PATH" \ --prefix "PATH" : "$out/share/panamax-api/bin:${env.ruby}/bin:$PATH" \
--prefix "HOME" : "$out/share/panamax-api" \ --prefix "HOME" : "$out/share/panamax-api" \
--prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \ --prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \
--prefix "OPENSSL_X509_CERT_FILE" : "${cacert}/etc/ca-bundle.crt" \ --prefix "OPENSSL_X509_CERT_FILE" : "${cacert}/ca-bundle.crt" \
--prefix "SSL_CERT_FILE" : "${cacert}/etc/ca-bundle.crt" \ --prefix "SSL_CERT_FILE" : "${cacert}/ca-bundle.crt" \
--prefix "GEM_PATH" : "$out/share/panamax-api:${bundler}/${env.ruby.gemPath}" --prefix "GEM_PATH" : "$out/share/panamax-api:${bundler}/${env.ruby.gemPath}"
''; '';

2
pkgs/applications/networking/instant-messengers/fuze/default.nix
View file

@ -6,7 +6,7 @@ assert stdenv.system == "x86_64-linux";
let let
curl_custom = curl_custom =
stdenv.lib.overrideDerivation curl (args: { stdenv.lib.overrideDerivation curl (args: {
configureFlags = args.configureFlags ++ ["--with-ca-bundle=${cacert}/etc/ca-bundle.crt"] ; configureFlags = args.configureFlags ++ ["--with-ca-bundle=${cacert}/ca-bundle.crt"] ;
} ); } );
in in
stdenv.mkDerivation { stdenv.mkDerivation {

2
pkgs/applications/networking/irc/weechat/default.nix
View file

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
cacert cmake ] cacert cmake ]
++ extraBuildInputs; ++ extraBuildInputs;
NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix} -DCA_FILE=${cacert}/etc/ca-bundle.crt"; NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix} -DCA_FILE=${cacert}/ca-bundle.crt";
postInstall = '' postInstall = ''
NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages" NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages"

4
pkgs/applications/version-management/bazaar/default.nix
View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1c6sj77h5f97qimjc14kr532kgc0jk3wq778xrkqi0pbh9qpk509"; sha256 = "1c6sj77h5f97qimjc14kr532kgc0jk3wq778xrkqi0pbh9qpk509";
}; };
buildInputs = [ pythonPackages.python pythonPackages.wrapPython cacert ]; buildInputs = [ pythonPackages.python pythonPackages.wrapPython ];
# Readline support is needed by bzrtools. # Readline support is needed by bzrtools.
pythonPath = [ pythonPackages.readline ]; pythonPath = [ pythonPackages.readline ];
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
patches = [ ./add_certificates.patch ]; patches = [ ./add_certificates.patch ];
postPatch = '' postPatch = ''
substituteInPlace bzrlib/transport/http/_urllib2_wrappers.py \ substituteInPlace bzrlib/transport/http/_urllib2_wrappers.py \
--subst-var-by "certPath" "${cacert}/etc/ca-bundle.crt" --subst-var-by "certPath" "${cacert}/ca-bundle.crt"
''; '';

2
pkgs/build-support/fetchgit/default.nix
View file

@ -54,7 +54,7 @@ stdenv.mkDerivation {
inherit url rev leaveDotGit fetchSubmodules deepClone branchName; inherit url rev leaveDotGit fetchSubmodules deepClone branchName;
GIT_SSL_CAINFO = "${cacert}/etc/ca-bundle.crt"; GIT_SSL_CAINFO = "${cacert}/ca-bundle.crt";
impureEnvVars = [ impureEnvVars = [
# We borrow these environment variables from the caller to allow # We borrow these environment variables from the caller to allow

2
pkgs/build-support/rust/fetchcargo.nix
View file

@ -16,7 +16,7 @@ stdenv.mkDerivation {
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHash = sha256; outputHash = sha256;
SSL_CERT_FILE = "${cacert}/etc/ca-bundle.crt"; SSL_CERT_FILE = "${cacert}/ca-bundle.crt";
impureEnvVars = [ "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" ]; impureEnvVars = [ "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" ];
preferLocalBuild = true; preferLocalBuild = true;

4
pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt { stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt
, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper , intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper
, docbook_xsl_ns, docbook_xsl, gnome3 }: , docbook_xsl_ns, docbook_xsl, gnome3, cacert }:
let let
majVer = gnome3.version; majVer = gnome3.version;
@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ]; nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ];
configureFlags = [ configureFlags = [
"--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt" # NixOS hardcoded path "--with-ca-certificates=${cacert}/ca-bundle.crt" # NixOS hardcoded path
"--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories
"--with-pkcs11-modules=$$out/lib/pkcs11/" "--with-pkcs11-modules=$$out/lib/pkcs11/"
]; ];

2
pkgs/development/compilers/icedtea/default.nix
View file

@ -135,7 +135,7 @@ let
# Generate certificates. # Generate certificates.
pushd $jre/lib/icedtea/jre/lib/security pushd $jre/lib/icedtea/jre/lib/security
rm cacerts rm cacerts
perl ${./generate-cacerts.pl} $jre/lib/icedtea/jre/bin/keytool ${cacert}/etc/ca-bundle.crt perl ${./generate-cacerts.pl} $jre/lib/icedtea/jre/bin/keytool ${cacert}/ca-bundle.crt
popd popd
ln -s $out/lib/icedtea/bin $out/bin ln -s $out/lib/icedtea/bin $out/bin

2
pkgs/development/compilers/openjdk/default.nix
View file

@ -142,7 +142,7 @@ let
# Generate certificates. # Generate certificates.
pushd $jre/lib/openjdk/jre/lib/security pushd $jre/lib/openjdk/jre/lib/security
rm cacerts rm cacerts
perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ca-bundle.crt perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/ca-bundle.crt
popd popd
ln -s $out/lib/openjdk/bin $out/bin ln -s $out/lib/openjdk/bin $out/bin

2
pkgs/development/compilers/openjdk/openjdk8.nix
View file

@ -134,7 +134,7 @@ let
# Generate certificates. # Generate certificates.
pushd $jre/lib/openjdk/jre/lib/security pushd $jre/lib/openjdk/jre/lib/security
rm cacerts rm cacerts
perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ca-bundle.crt perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/ca-bundle.crt
popd popd
ln -s $out/lib/openjdk/bin $out/bin ln -s $out/lib/openjdk/bin $out/bin

2
pkgs/development/interpreters/elixir/default.nix
View file

@ -33,7 +33,7 @@ stdenv.mkDerivation {
if [ $b == "mix" ]; then continue; fi if [ $b == "mix" ]; then continue; fi
wrapProgram $f \ wrapProgram $f \
--prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl}/bin:${bash}/bin" \ --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl}/bin:${bash}/bin" \
--set CURL_CA_BUNDLE "${cacert}/etc/ca-bundle.crt" --set CURL_CA_BUNDLE "${cacert}/ca-bundle.crt"
done done
''; '';

4
pkgs/development/lisp-modules/lisp-packages.nix
View file

@ -40,7 +40,7 @@ let lispPackages = rec {
url = "https://common-lisp.net/project/iterate/darcs/iterate"; url = "https://common-lisp.net/project/iterate/darcs/iterate";
sha256 = "0gm05s3laiivsqgqjfj1rkz83c2c0jyn4msfgbv6sz42znjpam25"; sha256 = "0gm05s3laiivsqgqjfj1rkz83c2c0jyn4msfgbv6sz42znjpam25";
context = ./iterate.darcs-context; context = ./iterate.darcs-context;
}) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ca-bundle.crt";})); }) (x: {SSL_CERT_FILE=pkgs.cacert + "/ca-bundle.crt";}));
overrides = x: { overrides = x: {
configurePhase="buildPhase(){ true; }"; configurePhase="buildPhase(){ true; }";
}; };
@ -314,7 +314,7 @@ let lispPackages = rec {
src = (pkgs.lib.overrideDerivation (pkgs.fetchdarcs { src = (pkgs.lib.overrideDerivation (pkgs.fetchdarcs {
url = ''http://common-lisp.net/project/trivial-utf-8/darcs/trivial-utf-8/''; url = ''http://common-lisp.net/project/trivial-utf-8/darcs/trivial-utf-8/'';
sha256 = "1jz27gz8gvqdmvp3k9bxschs6d5b3qgk94qp2bj6nv1d0jc3m1l1"; sha256 = "1jz27gz8gvqdmvp3k9bxschs6d5b3qgk94qp2bj6nv1d0jc3m1l1";
}) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ca-bundle.crt";})); }) (x: {SSL_CERT_FILE=pkgs.cacert + "/ca-bundle.crt";}));
}; };
cl-fuse-meta-fs = buildLispPackage rec { cl-fuse-meta-fs = buildLispPackage rec {

2
pkgs/tools/networking/aria2/default.nix
View file

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ cacert ]; propagatedBuildInputs = [ cacert ];
configureFlags = [ "--with-ca-bundle=${cacert}/etc/ca-bundle.crt" ]; configureFlags = [ "--with-ca-bundle=${cacert}/ca-bundle.crt" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://aria2.sourceforge.net/; homepage = http://aria2.sourceforge.net/;