public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnuplot: bump to 5.0.0, allow choosing qt version 

default to qt5
This commit is contained in:
Eduard Bachmakov 2015-01-10 19:51:54 -05:00
parent 173f41cf0b
commit 5915d9c417
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/graphics/gnuplot/default.nix
View File

@ -14,18 +14,18 @@
, fontconfig ? null , fontconfig ? null
, gnused ? null , gnused ? null
, coreutils ? null , coreutils ? null
, withQt ? false, qt4 }: , withQt ? false, qt }:
assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null); assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null);
let let
withX = libX11 != null && !aquaterm && !stdenv.isDarwin; withX = libX11 != null && !aquaterm && !stdenv.isDarwin;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnuplot-4.6.6"; name = "gnuplot-5.0.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/gnuplot/${name}.tar.gz"; url = "mirror://sourceforge/gnuplot/${name}.tar.gz";
sha256 = "0x022d7psl9g6q389x5rjlfsvfciz88yrgxg4lig4ichs1pmj68z"; sha256 = "1bqg6zbsin9w9m53rbf6adzv0j2gs66z2p5pkd060jlipk2lnza1";
}; };
buildInputs = buildInputs =
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
++ lib.optional withTeXLive texLive ++ lib.optional withTeXLive texLive
++ lib.optional withLua lua ++ lib.optional withLua lua
++ lib.optionals withX [ libX11 libXpm libXt libXaw ] ++ 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 # compiling with wxGTK causes a malloc (double free) error on darwin
++ lib.optional (withWxGTK && !stdenv.isDarwin) wxGTK; ++ lib.optional (withWxGTK && !stdenv.isDarwin) wxGTK;

2
pkgs/top-level/all-packages.nix
View File

@ -1338,7 +1338,7 @@ let
gnupg = gnupg20; gnupg = gnupg20;
gnuplot = callPackage ../tools/graphics/gnuplot { }; gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt5; };
gnuplot_qt = gnuplot.override { withQt = true; }; gnuplot_qt = gnuplot.override { withQt = true; };