diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-04-01 13:36:31 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-04-01 13:36:31 +0000 |
| commit | 92b3cc5cfbdd867dd8fc6fe23acfee144248c6a3 (patch) | |
| tree | cc3239c1ac54d932e64538e50a79f7160c56ecfc /pkgs/tools | |
| parent | 8feb5fab5bd55934f367a2bb6bfb9535782a281f (diff) | |
* Working Graphviz / Athena widgets.
svn path=/nixpkgs/trunk/; revision=891
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/graphics/graphviz/builder.sh | 8 | ||||
| -rw-r--r-- | pkgs/tools/graphics/graphviz/default.nix | 16 |
2 files changed, 8 insertions, 16 deletions
diff --git a/pkgs/tools/graphics/graphviz/builder.sh b/pkgs/tools/graphics/graphviz/builder.sh deleted file mode 100644 index 1926fc3c9d11b..0000000000000 --- a/pkgs/tools/graphics/graphviz/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -buildinputs="$x11 $libpng $libjpeg $expat $freetype" -. $stdenv/setup - -if test -z "$x11"; then - configureFlags="$configureFlags --without-x" -fi - -genericBuild diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index c9303bc72a874..1bd47bd7b590d 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/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 "") + ]; } |