diff options
| -rw-r--r-- | pkgs/tools/graphics/gnuplot/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
2 files changed, 3 insertions, 9 deletions
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 ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f96fe5824bad..a165ec41ed86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1152,12 +1152,7 @@ let libassuan = libassuan2_1; }); - gnuplot = callPackage ../tools/graphics/gnuplot { - # use gccApple to compile on darwin, seems to resolve a malloc error - stdenv = if stdenv.isDarwin - then stdenvAdapters.overrideGCC stdenv gccApple - else stdenv; - }; + gnuplot = callPackage ../tools/graphics/gnuplot { }; gnuplot_qt = gnuplot.override { withQt = true; }; |