gnuplot: requires Qt 4
This commit is contained in:
@@ -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 [ qt.base ]
|
++ 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;
|
||||||
|
|
||||||
|
|||||||
@@ -1564,7 +1564,7 @@ let
|
|||||||
|
|
||||||
gnupg = gnupg20;
|
gnupg = gnupg20;
|
||||||
|
|
||||||
gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt5; };
|
gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt4; };
|
||||||
|
|
||||||
gnuplot_qt = gnuplot.override { withQt = true; };
|
gnuplot_qt = gnuplot.override { withQt = true; };
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user