Merge pull request #3355 from ttuegel/gnuplot

Update gnuplot and add optional Qt dependency
This commit is contained in:
Jaka Hudoklin 2014-07-26 02:14:56 +02:00
commit 598d0460cd
2 changed files with 9 additions and 3 deletions

View file

@ -13,29 +13,33 @@
, pkgconfig ? null
, fontconfig ? null
, gnused ? null
, coreutils ? null }:
, coreutils ? null
, qt ? null }:
assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null);
let
withX = libX11 != null && !aquaterm;
withQt = qt != null;
in
stdenv.mkDerivation rec {
name = "gnuplot-4.6.3";
name = "gnuplot-4.6.5";
src = fetchurl {
url = "mirror://sourceforge/gnuplot/${name}.tar.gz";
sha256 = "1xd7gqdhlk7k1p9yyqf9vkk811nadc7m4si0q3nb6cpv4pxglpyz";
sha256 = "0bcsa5b33msddjs6mj0rhi81cs19h9p3ykixkkl70ifhqwqg0l75";
};
buildInputs =
[ zlib gd texinfo readline emacs lua texLive
pango cairo pkgconfig makeWrapper ]
++ stdenv.lib.optionals withX [ libX11 libXpm libXt libXaw ]
++ stdenv.lib.optional withQt [ qt ]
# compiling with wxGTK causes a malloc (double free) error on darwin
++ stdenv.lib.optional (!stdenv.isDarwin) wxGTK;
configureFlags =
(if withX then ["--with-x"] else ["--without-x"])
++ (if withQt then ["--enable-qt"] else ["--disable-qt"])
++ (if aquaterm then ["--with-aquaterm"] else ["--without-aquaterm"])
;

View file

@ -1158,6 +1158,8 @@ let
else stdenv;
};
gnuplot_qt = gnuplot.override { qt = qt4; };
# must have AquaTerm installed separately
gnuplot_aquaterm = gnuplot.override { aquaterm = true; };