alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

gnuplot: requires Qt 4

Browse source
This commit is contained in:
Thomas Tuegel 2015-05-25 21:04:01 -05:00
parent f2f635b1f5
commit 255c0903a1
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/tools/graphics/gnuplot/default.nix
View file

@ -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;

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

@ -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; };