tcl/tk: Tie versioning together and propagate

1 files changed, 15 insertions, 9 deletions

diff --git a/pkgs/development/interpreters/tcl/default.nix b/pkgs/development/interpreters/tcl/default.nix
index 913c73f01f36..aa3836399ba5 100644
--- a/pkgs/development/interpreters/tcl/default.nix
+++ b/pkgs/development/interpreters/tcl/default.nix
@@ -1,10 +1,13 @@
 { stdenv, fetchurl }:
-
-stdenv.mkDerivation {
-  name = "tcl-8.6.4";
+let
+  release = "8.6";
+in
+stdenv.mkDerivation rec {
+  name = "tcl-${version}";
+  version = "${release}.4";
 
   src = fetchurl {
-    url = mirror://sourceforge/tcl/tcl8.6.4-src.tar.gz;
+    url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz";
     sha256 = "13cwa4bc85ylf5gfj9vk182lvgy60qni3f7gbxghq78wk16djvly";
   };
 
@@ -12,16 +15,19 @@ stdenv.mkDerivation {
 
   postInstall = ''
     make install-private-headers
-    ln -s $out/bin/tclsh8.6 $out/bin/tclsh
+    ln -s $out/bin/tclsh${release} $out/bin/tclsh
   '';
   
-  meta = {
+  meta = with stdenv.lib; {
     description = "The Tcl scription language";
     homepage = http://www.tcl.tk/;
-    license = stdenv.lib.licenses.tcltk;
+    license = licenses.tcltk;
+    platforms = platforms.all;
   };
   
-  passthru = {
-    libdir = "lib/tcl8.5";
+  passthru = rec {
+    inherit release version;
+    libPrefix = "tcl${release}";
+    libdir = "lib/${libPrefix}";
   };
 }