diff options
author | William A. Kennington III <william@wkennington.com> | 2015-05-29 14:26:07 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-05-29 14:26:32 -0700 |
commit | cd52c044568bdf1108428698048a9af92dc0b625 (patch) | |
tree | 1b054b2a5d3605ada511e4ee7a7ab409a79776c0 /pkgs/applications | |
parent | 95cc27149c75bc6146b231893faa4a02002b9d84 (diff) | |
download | nixlib-cd52c044568bdf1108428698048a9af92dc0b625.tar nixlib-cd52c044568bdf1108428698048a9af92dc0b625.tar.gz nixlib-cd52c044568bdf1108428698048a9af92dc0b625.tar.bz2 nixlib-cd52c044568bdf1108428698048a9af92dc0b625.tar.lz nixlib-cd52c044568bdf1108428698048a9af92dc0b625.tar.xz nixlib-cd52c044568bdf1108428698048a9af92dc0b625.tar.zst nixlib-cd52c044568bdf1108428698048a9af92dc0b625.zip |
Fix more ca-bundle paths
Diffstat (limited to 'pkgs/applications')
5 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index d438bb77b859..27dde61a08c2 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -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 ]; }; diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index b30b2e260e32..24a43d95ca9b 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -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 ]; diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix index 8e1e00795d24..7ab5c397abe5 100644 --- a/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -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 ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index e8e76c10ea5e..b7cebd47cd71 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -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; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index a9fbd89f3fa1..dee2abd2b1f3 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -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 |