From 9f08904c8d0b55f56c5778f4b4e1725c71c82201 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 9 Aug 2014 19:52:33 +0200 Subject: gnuplot: Use default compiler on Darwin --- pkgs/tools/graphics/gnuplot/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkgs/tools/graphics') diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 164b3ba1d284..f92c82e3d744 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -18,7 +18,7 @@ assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null); let - withX = libX11 != null && !aquaterm; + withX = libX11 != null && !aquaterm && !stdenv.isDarwin; in stdenv.mkDerivation rec { name = "gnuplot-4.6.5"; @@ -29,8 +29,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ zlib gd texinfo4 readline - pango cairo pkgconfig makeWrapper ] + [ zlib gd texinfo4 readline pango cairo pkgconfig makeWrapper ] ++ lib.optional withTeXLive texLive ++ lib.optional withLua lua ++ lib.optionals withX [ libX11 libXpm libXt libXaw ] -- cgit 1.4.1