From d058ae5b0bafd2aa7a4075c9f09409b5a9a7329e Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 9 Sep 2012 05:26:37 +0200 Subject: [PATCH] tkabber: Add tclgpg to TCLLIBPATH. This ensures that Tkabber can now be used with GPG support, though as of gnupg version 2, this requires gpg-agent as well. Only if all conditions are met, an option to actually use GPG will show up in Tkabber's settings. Signed-off-by: aszlig --- .../networking/instant-messengers/tkabber/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix index 6014f582467..8bf7b44de9c 100644 --- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, tcl, tk, tcllib, tcltls, bwidget, cacert, makeWrapper, x11 }: +{ stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg +, bwidget, cacert, makeWrapper, x11 }: stdenv.mkDerivation rec { name = "tkabber-0.11.1"; @@ -26,10 +27,10 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram $out/bin/tkabber --set TCLLIBPATH "${bwidget}/lib/${bwidget.libPrefix}\ ${tcllib}/lib/${tcllib.libPrefix}\ ${tcltls}/lib/${tcltls.libPrefix}" + wrapProgram $out/bin/tkabber --set TCLLIBPATH "${bwidget}/lib/${bwidget.libPrefix}\ ${tcllib}/lib/${tcllib.libPrefix}\ ${tcltls}/lib/${tcltls.libPrefix}\ ${tclgpg}/lib/${tclgpg.libPrefix}" ''; - buildInputs = [ tcl tk tcllib tcltls bwidget x11 makeWrapper ]; + buildInputs = [ tcl tk tcllib tcltls tclgpg bwidget x11 makeWrapper ]; meta = { homepage = "http://tkabber.jabber.ru/";