Merge pull request #3355 from ttuegel/gnuplot
Update gnuplot and add optional Qt dependency
This commit is contained in:
commit
598d0460cd
|
@ -13,29 +13,33 @@
|
||||||
, pkgconfig ? null
|
, pkgconfig ? null
|
||||||
, fontconfig ? null
|
, fontconfig ? null
|
||||||
, gnused ? null
|
, gnused ? null
|
||||||
, coreutils ? null }:
|
, coreutils ? null
|
||||||
|
, qt ? null }:
|
||||||
|
|
||||||
assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null);
|
assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null);
|
||||||
let
|
let
|
||||||
withX = libX11 != null && !aquaterm;
|
withX = libX11 != null && !aquaterm;
|
||||||
|
withQt = qt != null;
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "gnuplot-4.6.3";
|
name = "gnuplot-4.6.5";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/gnuplot/${name}.tar.gz";
|
url = "mirror://sourceforge/gnuplot/${name}.tar.gz";
|
||||||
sha256 = "1xd7gqdhlk7k1p9yyqf9vkk811nadc7m4si0q3nb6cpv4pxglpyz";
|
sha256 = "0bcsa5b33msddjs6mj0rhi81cs19h9p3ykixkkl70ifhqwqg0l75";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ zlib gd texinfo readline emacs lua texLive
|
[ zlib gd texinfo readline emacs lua texLive
|
||||||
pango cairo pkgconfig makeWrapper ]
|
pango cairo pkgconfig makeWrapper ]
|
||||||
++ stdenv.lib.optionals withX [ libX11 libXpm libXt libXaw ]
|
++ stdenv.lib.optionals withX [ libX11 libXpm libXt libXaw ]
|
||||||
|
++ stdenv.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
|
||||||
++ stdenv.lib.optional (!stdenv.isDarwin) wxGTK;
|
++ stdenv.lib.optional (!stdenv.isDarwin) wxGTK;
|
||||||
|
|
||||||
configureFlags =
|
configureFlags =
|
||||||
(if withX then ["--with-x"] else ["--without-x"])
|
(if withX then ["--with-x"] else ["--without-x"])
|
||||||
|
++ (if withQt then ["--enable-qt"] else ["--disable-qt"])
|
||||||
++ (if aquaterm then ["--with-aquaterm"] else ["--without-aquaterm"])
|
++ (if aquaterm then ["--with-aquaterm"] else ["--without-aquaterm"])
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|
|
@ -1158,6 +1158,8 @@ let
|
||||||
else stdenv;
|
else stdenv;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
gnuplot_qt = gnuplot.override { qt = qt4; };
|
||||||
|
|
||||||
# must have AquaTerm installed separately
|
# must have AquaTerm installed separately
|
||||||
gnuplot_aquaterm = gnuplot.override { aquaterm = true; };
|
gnuplot_aquaterm = gnuplot.override { aquaterm = true; };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue