diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index b1d02149d37..f8dd35576ff 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -14,18 +14,18 @@ , fontconfig ? null , gnused ? null , coreutils ? null -, withQt ? false, qt4 }: +, withQt ? false, qt }: assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null); let withX = libX11 != null && !aquaterm && !stdenv.isDarwin; in stdenv.mkDerivation rec { - name = "gnuplot-4.6.6"; + name = "gnuplot-5.0.0"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; - sha256 = "0x022d7psl9g6q389x5rjlfsvfciz88yrgxg4lig4ichs1pmj68z"; + sha256 = "1bqg6zbsin9w9m53rbf6adzv0j2gs66z2p5pkd060jlipk2lnza1"; }; buildInputs = @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ++ lib.optional withTeXLive texLive ++ lib.optional withLua lua ++ lib.optionals withX [ libX11 libXpm libXt libXaw ] - ++ lib.optional withQt [ qt4 ] + ++ lib.optional withQt [ qt ] # compiling with wxGTK causes a malloc (double free) error on darwin ++ lib.optional (withWxGTK && !stdenv.isDarwin) wxGTK; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66dba26f70c..f39d3f20605 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1338,7 +1338,7 @@ let gnupg = gnupg20; - gnuplot = callPackage ../tools/graphics/gnuplot { }; + gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt5; }; gnuplot_qt = gnuplot.override { withQt = true; };