diff options
author | aszlig <aszlig@redmoonstudios.org> | 2012-09-09 05:41:40 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2012-09-09 06:59:59 +0200 |
commit | 5d159722787ea2fab471e427306ed4b371e95576 (patch) | |
tree | 543516fb02149b0374f52704ee0e8c5fbb5e1c11 /pkgs/applications/networking/instant-messengers/tkabber | |
parent | d058ae5b0bafd2aa7a4075c9f09409b5a9a7329e (diff) | |
download | nixlib-5d159722787ea2fab471e427306ed4b371e95576.tar nixlib-5d159722787ea2fab471e427306ed4b371e95576.tar.gz nixlib-5d159722787ea2fab471e427306ed4b371e95576.tar.bz2 nixlib-5d159722787ea2fab471e427306ed4b371e95576.tar.lz nixlib-5d159722787ea2fab471e427306ed4b371e95576.tar.xz nixlib-5d159722787ea2fab471e427306ed4b371e95576.tar.zst nixlib-5d159722787ea2fab471e427306ed4b371e95576.zip |
tkabber: Clean up TCLLIBPATH generation.
This should make things a lot more DRY as we now can generalize library paths by using the libPrefix attribute of each library. In addition this also cuts the line length in wrapProgram. 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 | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix index 8bf7b44de9c0..56672dee33f0 100644 --- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix @@ -1,7 +1,15 @@ { stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg , bwidget, cacert, makeWrapper, x11 }: -stdenv.mkDerivation rec { +let + tclLibraries = [ bwidget tcllib tcltls tclgpg ]; + + getTclLibPath = p: "${p}/lib/${p.libPrefix}"; + + tclLibPaths = stdenv.lib.concatStringsSep " " + (map getTclLibPath tclLibraries); + +in stdenv.mkDerivation rec { name = "tkabber-0.11.1"; src = fetchurl { @@ -27,10 +35,10 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram $out/bin/tkabber --set TCLLIBPATH "${bwidget}/lib/${bwidget.libPrefix}\ ${tcllib}/lib/${tcllib.libPrefix}\ ${tcltls}/lib/${tcltls.libPrefix}\ ${tclgpg}/lib/${tclgpg.libPrefix}" + wrapProgram $out/bin/tkabber --set TCLLIBPATH '"${tclLibPaths}"' ''; - buildInputs = [ tcl tk tcllib tcltls tclgpg bwidget x11 makeWrapper ]; + buildInputs = [ tcl tk x11 makeWrapper ] ++ tclLibraries; meta = { homepage = "http://tkabber.jabber.ru/"; |