public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix more ca-bundle paths

Browse Source
This commit is contained in:
William A. Kennington III 2015-05-29 14:26:07 -07:00
parent 95cc27149c
commit cd52c04456
9 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/shotwell/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite, webkitgtk24x
, pkgconfig, gnome3, gst_all_1, which, udev, libraw, glib, json_glib, gettext, desktop_file_utils
, lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils, hicolor_icon_theme }:
, lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils, hicolor_icon_theme, cacert }:
# for dependencies see http://www.yorba.org/projects/shotwell/install/
@ -13,7 +13,7 @@ let
sha256 = "0fmg7fq5fx0jg3ryk71kwdkspsvj42acxy9imk7vznkqj29a9zqn";
};
configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt";
buildInputs = [ pkgconfig glib libsoup ];
};

4
pkgs/applications/networking/browsers/vimb/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk, glib_networking
, gsettings_desktop_schemas, makeWrapper
, gsettings_desktop_schemas, makeWrapper, cacert
}:
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
# Nixos default ca bundle
patchPhase = ''
sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, src/config.def.h
sed -i s,/etc/ssl/certs/ca-certificates.crt,${cacert}/ca-bundle.crt, src/config.def.h
'';
buildInputs = [ makeWrapper gtk libsoup pkgconfig webkit gsettings_desktop_schemas ];

4
pkgs/applications/networking/browsers/vimprobable2/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, glib, glib_networking, gtk, libsoup, libX11, perl,
pkgconfig, webkit, gsettings_desktop_schemas }:
pkgconfig, webkit, gsettings_desktop_schemas, cacert }:
stdenv.mkDerivation rec {
version = "1.4.2";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
# Nixos default ca bundle
patchPhase = ''
sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, config.h
sed -i s,/etc/ssl/certs/ca-certificates.crt,${cacert}/ca-bundle.crt, config.h
'';
buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit gsettings_desktop_schemas ];

4
pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib, dbus_daemon
, sqlite, libsoup, libnice, gnutls }:
, sqlite, libsoup, libnice, gnutls, cacert }:
stdenv.mkDerivation rec {
name = "telepathy-gabble-0.18.2";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ]
++ stdenv.lib.optional doCheck dbus_daemon;
configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt";
enableParallelBuilding = true;
doCheck = true;

4
pkgs/applications/version-management/mercurial/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, python, makeWrapper, docutils, unzip
, guiSupport ? false, tk ? null, curses }:
, guiSupport ? false, tk ? null, curses, cacert }:
let
version = "3.3.3";
@ -44,7 +44,7 @@ stdenv.mkDerivation {
mkdir -p $out/etc/mercurial
cat >> $out/etc/mercurial/hgrc << EOF
[web]
cacerts = /etc/ssl/certs/ca-bundle.crt
cacerts = ${cacert}/ca-bundle.crt
EOF
# copy hgweb.cgi to allow use in apache

4
pkgs/desktops/gnome-3/3.16/core/rest/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection }:
{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, cacerts }:
stdenv.mkDerivation rec {
name = "rest-0.7.92";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig glib libsoup gobjectIntrospection];
configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
configureFlags = "--with-ca-certificates=${cacerts}/ca-bundle.crt";
meta = with stdenv.lib; {
platforms = platforms.linux;

4
pkgs/development/libraries/glib-networking/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, intltool, gnutls, libproxy
, gsettings_desktop_schemas }:
, gsettings_desktop_schemas, cacert }:
let
ver_maj = "2.44";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346";
};
configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
configureFlags = "--with-ca-certificates=${cacert}/ca-bundle.crt";
preBuild = ''
sed -e "s@${glib}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile)

2
pkgs/servers/mail/opensmtpd/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
"--with-sock-dir=/run"
"--with-privsep-user=smtpd"
"--with-queue-user=smtpq"
"--with-ca-file=/etc/ssl/certs/ca-bundle.crt"
"--with-ca-file=${cacert}/ca-bundle.crt"
];
installFlags = [

5
pkgs/tools/security/prey/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, fetchgit, curl, scrot, imagemagick, xawtv, inetutils, makeWrapper, coreutils
{ stdenv, fetchurl, fetchgit, curl, scrot, imagemagick, xawtv, inetutils
, makeWrapper, coreutils, cacert
, apiKey ? ""
, deviceKey ? "" }:
@ -35,7 +36,7 @@ in stdenv.mkDerivation rec {
cp -R ${modulesSrc}/* $out/modules/
wrapProgram "$out/prey.sh" \
--prefix PATH ":" "${xawtv}/bin:${imagemagick}/bin:${curl}/bin:${scrot}/bin:${inetutils}/bin:${coreutils}/bin" \
--set CURL_CA_BUNDLE "/etc/ssl/certs/ca-bundle.crt"
--set CURL_CA_BUNDLE "${cacert}/ca-bundle.crt"
'';
meta = with stdenv.lib; {