From f96b77a4ce2b73a61d8f6a7d3c50c57b18f97644 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 7 May 2010 14:01:57 +0000 Subject: [PATCH] gnuplot: updated to version 4.4.0 svn path=/nixpkgs/trunk/; revision=21648 --- pkgs/tools/graphics/gnuplot/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 303bc38741c9..c10777f66ab2 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -1,4 +1,6 @@ { stdenv, fetchurl, zlib, gd, texinfo +, texLive ? null +, lua ? null , emacs ? null , libX11 ? null , libXt ? null @@ -19,15 +21,15 @@ assert x11Support -> ((libX11 != null) && assert (wxGTK != null) -> x11Support; stdenv.mkDerivation { - name = "gnuplot-4.2.6"; + name = "gnuplot-4.4.0"; src = fetchurl { - url = "mirror://sourceforge/gnuplot/gnuplot-4.2.6.tar.gz"; - sha256 = "10lfmbib3wrzfhvjqk7ffc29fb2aw6m84p4cx6znmgbpc3mw5yw1"; + url = "mirror://sourceforge/gnuplot/gnuplot-4.4.0.tar.gz"; + sha256 = "0akb2lzxa3b0j4nr6anr0mhsk10b1fcnixk8vk9aa82rl1a2rph0"; }; configureFlags = if x11Support then ["--with-x"] else ["--without-x"]; - buildInputs = [zlib gd texinfo readline emacs] ++ + buildInputs = [zlib gd texinfo readline emacs lua texLive] ++ (if x11Support then [libX11 libXt libXpm libXaw] else []) ++ (if wxGTK != null then [wxGTK pango cairo pkgconfig] else []); }