diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2012-09-09 06:02:57 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2012-09-09 07:00:00 +0200 |
| commit | 36947c89570c06630a295a4b021619a577c2a033 (patch) | |
| tree | c2cf3da7af417cdb0460bcd96b5febe70c7b1910 /pkgs/applications/networking/instant-messengers/tkabber | |
| parent | c544eb4c713caff1faa92312a2c45fa0aa3cbbcf (diff) | |
| download | nixlib-36947c89570c06630a295a4b021619a577c2a033.tar nixlib-36947c89570c06630a295a4b021619a577c2a033.tar.gz nixlib-36947c89570c06630a295a4b021619a577c2a033.tar.bz2 nixlib-36947c89570c06630a295a4b021619a577c2a033.tar.lz nixlib-36947c89570c06630a295a4b021619a577c2a033.tar.xz nixlib-36947c89570c06630a295a4b021619a577c2a033.tar.zst nixlib-36947c89570c06630a295a4b021619a577c2a033.zip | |
tkabber: Honor OPENSSL_X509_CERT_FILE.
This gets rid of the dependency on cacert and ensures that Tkabber will read OPENSSL_X509_CERT_FILE whenever the sslcacertstore is not set by the user in Tkabber's options. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/tkabber')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/tkabber/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix index 3b6547a8be90..03a98cb20597 100644 --- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg -, bwidget, cacert, makeWrapper, x11 }: +, bwidget, makeWrapper, x11 }: let tclLibraries = [ bwidget tcllib tcltls tclgpg ]; @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { patchPhase = '' substituteInPlace login.tcl --replace \ "custom::defvar loginconf(sslcacertstore) \"\"" \ - "custom::defvar loginconf(sslcacertstore) \"${cacert}/etc/ca-bundle.crt\"" + "custom::defvar loginconf(sslcacertstore) \$env(OPENSSL_X509_CERT_FILE)" sed -i '/^if.*load_default_xrdb/,/^}$/ { s@option readfile \(\[fullpath [^]]*\]\)@option readfile "'"$out/share/doc/tkabber/examples/xrdb/${defaultTheme}.xrdb"'"@ |