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

bwidget/tcllib/tcltls: Add libPrefix attributes.

Browse Source 
This is what I forgot in the packages I have added a few months ago, so it's
time to revisit them and improve things, like for example set the right
libPrefix in order to stay consistent with other TCL libraries.

In addition this fixes some whitespace ugliness in the affected packages.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2012-09-09 05:08:37 +02:00
parent a9da133fda
commit 28a725fcbe
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
4 changed files with 19 additions and 7 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

@ -26,10 +26,10 @@ stdenv.mkDerivation rec {
'';
postInstall = ''
wrapProgram $out/bin/tkabber --set TCLLIBPATH "${bwidget}/tcltk\ ${tcllib}/lib/tcllib${tcllib.version}\ ${tcltls}/lib/tls${tcltls.version}"
wrapProgram $out/bin/tkabber --set TCLLIBPATH "${bwidget}/lib/${bwidget.libPrefix}\ ${tcllib}/lib/${tcllib.libPrefix}\ ${tcltls}/lib/${tcltls.libPrefix}"
'';
buildInputs = [tcl tk tcllib tcltls bwidget x11 makeWrapper];
buildInputs = [ tcl tk tcllib tcltls bwidget x11 makeWrapper ];
meta = {
homepage = "http://tkabber.jabber.ru/";

10
pkgs/development/libraries/bwidget/default.nix
View File

@ -12,9 +12,13 @@ stdenv.mkDerivation rec {
dontBuild = true;
installPhase = ''
ensureDir "$out/tcltk"
cp -R *.tcl lang images "$out/tcltk/"
ensureDir "$out/lib/${passthru.libPrefix}"
cp -R *.tcl lang images "$out/lib/${passthru.libPrefix}"
'';
buildInputs = [tcl];
passthru = {
libPrefix = "bwidget${version}";
};
buildInputs = [ tcl ];
}

6
pkgs/development/libraries/tcllib/default.nix
View File

@ -9,5 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "11052fgfmv9vyswzjjgfvh3pi0k3fnfnl9ri6nl4vc6f6z5ry56x";
};
buildInputs = [tcl];
passthru = {
libPrefix = "tcllib${version}";
};
buildInputs = [ tcl ];
}

6
pkgs/development/libraries/tcltls/default.nix
View File

@ -17,5 +17,9 @@ stdenv.mkDerivation rec {
sha256 = "adec50143a9ad634a671d24f7c7bbf2455487eb5f12d290f41797c32a98b93f3";
};
buildInputs = [tcl openssl];
passthru = {
libPrefix = "tls${version}";
};
buildInputs = [ tcl openssl ];
}