From 255c0903a1ac10a2b2518c343ac4613918075615 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 25 May 2015 21:04:01 -0500 Subject: [PATCH] gnuplot: requires Qt 4 --- pkgs/tools/graphics/gnuplot/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index fcd8a37382e..f8dd35576ff 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ++ lib.optional withTeXLive texLive ++ lib.optional withLua lua ++ 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 ++ lib.optional (withWxGTK && !stdenv.isDarwin) wxGTK; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3201bd5f851..95266a23863 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1564,7 +1564,7 @@ let gnupg = gnupg20; - gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt5; }; + gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt4; }; gnuplot_qt = gnuplot.override { withQt = true; };