jimtcl: 0.75 -> 0.76

1 files changed, 17 insertions, 8 deletions

diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix
index c9f1231aa6a..a67dc323601 100644
--- a/pkgs/development/interpreters/jimtcl/default.nix
+++ b/pkgs/development/interpreters/jimtcl/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchgit, sqlite }:
+{ stdenv, fetchFromGitHub, sqlite, readline, asciidoc, SDL, SDL_gfx }:
 
 stdenv.mkDerivation {
-  name = "jimtcl-0.75-git";
+  name = "jimtcl-0.76";
 
-  src = fetchgit {
-    url = https://github.com/msteveb/jimtcl.git;
-    rev = "c4d4bf8bc104733db1f5992a27d88fbfca9ba882";
-    sha256 = "1dm1qmb35hlp0d4i15c78n8jmbv7nhz2cgbrjyn6fjy6cy67sq0r";
+  src = fetchFromGitHub {
+    owner = "msteveb";
+    repo = "jimtcl";
+    rev = "51f65c6d38fbf86e1f0b036ad336761fd2ab7fa0";
+    sha256 = "00ldal1w9ysyfmx28xdcaz81vaazr1fqixxb2abk438yfpp1i9hq";
   };
 
   buildInputs = [
-    sqlite
+    sqlite readline asciidoc SDL SDL_gfx
   ];
 
   configureFlags = [
@@ -18,15 +19,23 @@ stdenv.mkDerivation {
     "--with-ext=tree"
     "--with-ext=binary"
     "--with-ext=sqlite3"
+    "--with-ext=readline"
+    "--with-ext=sdl"
     "--enable-utf8"
     "--ipv6"
   ];
 
+  preConfigurePhase = ''
+    export CFLAGS=$(sdl-config --cflags)
+    export LDFLAGS=$(sdl-config --libs)
+  '';
+
+
   meta = {
     description = "An open source small-footprint implementation of the Tcl programming language";
     homepage = http://jim.tcl.tk/;
     license = stdenv.lib.licenses.bsd2;
     platforms = stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ dbohdan ];
+    maintainers = with stdenv.lib.maintainers; [ dbohdan vrthra ];
   };
 }