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

tkabber: Honor OPENSSL_X509_CERT_FILE.

Browse Source 
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>
This commit is contained in:
aszlig 2012-09-09 06:02:57 +02:00
parent c544eb4c71
commit 36947c8957
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg { stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg
, bwidget, cacert, makeWrapper, x11 }: , bwidget, makeWrapper, x11 }:
let let
tclLibraries = [ bwidget tcllib tcltls tclgpg ]; tclLibraries = [ bwidget tcllib tcltls tclgpg ];
@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
patchPhase = '' patchPhase = ''
substituteInPlace login.tcl --replace \ substituteInPlace login.tcl --replace \
"custom::defvar loginconf(sslcacertstore) \"\"" \ "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/,/^}$/ { sed -i '/^if.*load_default_xrdb/,/^}$/ {
s@option readfile \(\[fullpath [^]]*\]\)@option readfile "'"$out/share/doc/tkabber/examples/xrdb/${defaultTheme}.xrdb"'"@ s@option readfile \(\[fullpath [^]]*\]\)@option readfile "'"$out/share/doc/tkabber/examples/xrdb/${defaultTheme}.xrdb"'"@