* Working Graphviz / Athena widgets.

svn path=/nixpkgs/trunk/; revision=891

pkgs/tools/graphics/graphviz/builder.sh

@@ -1,8 +0,0 @@
-buildinputs="$x11 $libpng $libjpeg $expat $freetype"
-. $stdenv/setup
-
-if test -z "$x11"; then 
-    configureFlags="$configureFlags --without-x"
-fi
-
-genericBuild

pkgs/tools/graphics/graphviz/default.nix

@@ -1,19 +1,19 @@
-{stdenv, fetchurl, x11, libpng, libjpeg, expat}:
+{stdenv, fetchurl, x11, libpng, libjpeg, expat, libXaw}:
 
-assert x11 != null && libpng != null && libjpeg != null
-  && expat != null;
+assert libpng != null && libjpeg != null && expat != null;
 
 stdenv.mkDerivation {
   name = "graphviz-1.10";
 
-  builder = ./builder.sh;
   src = fetchurl {
     url = http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-1.10.tar.gz;
     md5 = "e1402531abff68d146bf94e72b44dc2a";
+#    url = http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-1.12.tar.gz;
+#    md5 = "84910caae072c714d107ca9f3e54ace0";
   };
 
-  x11 = x11;
-  libpng = libpng;
-  libjpeg = libjpeg;
-  expat = expat;
+  buildInputs = [x11 libpng libjpeg expat libXaw];
+  configureFlags = [
+    (if x11 == null then "--without-x" else "")
+  ];
 }