diff options
4 files changed, 19 insertions, 7 deletions
diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix index 30c91d3d905..6014f582467 100644 --- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix @@ -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/"; diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index 693e0587a0b..b8aed94bb0b 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -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 ]; } diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix index fcfbbe19d94..6aec229f529 100644 --- a/pkgs/development/libraries/tcllib/default.nix +++ b/pkgs/development/libraries/tcllib/default.nix @@ -9,5 +9,9 @@ stdenv.mkDerivation rec { sha256 = "11052fgfmv9vyswzjjgfvh3pi0k3fnfnl9ri6nl4vc6f6z5ry56x"; }; - buildInputs = [tcl]; + passthru = { + libPrefix = "tcllib${version}"; + }; + + buildInputs = [ tcl ]; } diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix index dbbfc3d3855..3f984c377dd 100644 --- a/pkgs/development/libraries/tcltls/default.nix +++ b/pkgs/development/libraries/tcltls/default.nix @@ -17,5 +17,9 @@ stdenv.mkDerivation rec { sha256 = "adec50143a9ad634a671d24f7c7bbf2455487eb5f12d290f41797c32a98b93f3"; }; - buildInputs = [tcl openssl]; + passthru = { + libPrefix = "tls${version}"; + }; + + buildInputs = [ tcl openssl ]; } |