From 02ea8daffa39158077662a1ed0b44d2933703c68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 3 Jun 2010 15:37:02 +0000
Subject: [PATCH] Making gtkwave more featured, adding more buildInputs.

svn path=/nixpkgs/trunk/; revision=22133
---
 .../science/electronics/gtkwave/default.nix      |  6 ++++--
 pkgs/development/libraries/judy/default.nix      | 16 ++++++++++++++++
 pkgs/top-level/all-packages.nix                  |  6 +++++-
 3 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/judy/default.nix

diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index 78ba33e0f67..6789eb4fda5 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, xz} :
+{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, xz, tcl, tk, judy} :
 stdenv.mkDerivation rec {
   name = "gtkwave-3.3.6";
 
@@ -7,7 +7,9 @@ stdenv.mkDerivation rec {
     sha256 = "0vlayjvhmijcg4pbjix9lm1d5n2wxzcn16lkm2ysgpc8q6987df8";
   };
 
-  buildInputs = [ gtk gperf pkgconfig bzip2 xz ];
+  buildInputs = [ gtk gperf pkgconfig bzip2 xz tcl tk judy];
+
+  configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--enable-judy" ];
 
   meta = {
     description = "Wave viewer for Unix and Win32";
diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix
new file mode 100644
index 00000000000..8c45adf4b57
--- /dev/null
+++ b/pkgs/development/libraries/judy/default.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "judy-1.0.5";
+
+  src = fetchurl {
+    url = mirror://sourceforge/judy/Judy-1.0.5.tar.gz;
+    sha256 = "1sv3990vsx8hrza1mvq3bhvv9m6ff08y4yz7swn6znszz24l0w6j";
+  };
+
+  meta = {
+    homepage = http://judy.sourceforge.net/;
+    license = "LGPLv2.1+";
+    description = "State-of-the-art C library that implements a sparse dynamic array";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4421c56df65..c91a345758f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4290,6 +4290,10 @@ let
     inherit stdenv fetchurl;
   };
 
+  judy = import ../development/libraries/judy {
+    inherit fetchurl stdenv;
+  };
+
   krb5 = import ../development/libraries/kerberos/krb5.nix {
     inherit stdenv fetchurl perl ncurses yacc;
   };
@@ -9490,7 +9494,7 @@ let
   };
 
   gtkwave = import ../applications/science/electronics/gtkwave {
-    inherit fetchurl stdenv gperf pkgconfig bzip2 xz;
+    inherit fetchurl stdenv gperf pkgconfig bzip2 xz tcl tk judy;
     inherit (gtkLibs) gtk;
   };