gnuplot: add optional Qt terminal
This commit is contained in:
parent
760cad296d
commit
ac01b79c73
|
@ -13,11 +13,13 @@
|
||||||
, 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.5";
|
name = "gnuplot-4.6.5";
|
||||||
|
@ -31,11 +33,13 @@ stdenv.mkDerivation rec {
|
||||||
[ 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"])
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|
|
@ -1156,6 +1156,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