tcl/tk: Refactor and add maintainers

2 files changed, 14 insertions, 7 deletions

diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix
index 8b5722c79c8d..cfa4bb48c197 100644
--- a/pkgs/development/interpreters/tcl/generic.nix
+++ b/pkgs/development/interpreters/tcl/generic.nix
@@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
 
   inherit src;
 
-  preConfigure = "cd unix";
+  preConfigure = ''
+    cd unix
+  '';
 
   postInstall = ''
     make install-private-headers
@@ -22,6 +24,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.tcl.tk/;
     license = licenses.tcltk;
     platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
   };
   
   passthru = rec {
diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/default.nix
index 5f07befcfa54..a847f848a02a 100644
--- a/pkgs/development/libraries/tk/default.nix
+++ b/pkgs/development/libraries/tk/default.nix
@@ -14,9 +14,13 @@ stdenv.mkDerivation {
     ln -s $out/bin/wish* $out/bin/wish
   '';
 
-  configureFlags = "--with-tcl=${tcl}/lib";
+  preConfigure = ''
+    cd unix
+  '';
 
-  preConfigure = "cd unix";
+  configureFlags = [
+    "--with-tcl=${tcl}/lib"
+  ];
 
   buildInputs = [ pkgconfig tcl libXft ]
     ++ stdenv.lib.optional stdenv.isDarwin fontconfig;
@@ -31,11 +35,11 @@ stdenv.mkDerivation {
     libdir = "lib/${libPrefix}";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A widget toolkit that provides a library of basic elements for building a GUI in many different programming languages";
     homepage = http://www.tcl.tk/;
-    license = stdenv.lib.licenses.tcltk;
-    maintainers = with stdenv.lib.maintainers; [ lovek323 ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.tcltk;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ lovek323 wkennington ];
   };
 }