diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-09 19:52:33 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-09 19:53:09 +0200 |
commit | 9f08904c8d0b55f56c5778f4b4e1725c71c82201 (patch) | |
tree | 06b3619c186d1cf4a3af29374d07321f89abd618 | |
parent | 8ede29197fd7f9f714399cbe2e53b5d229207319 (diff) | |
download | nixlib-9f08904c8d0b55f56c5778f4b4e1725c71c82201.tar nixlib-9f08904c8d0b55f56c5778f4b4e1725c71c82201.tar.gz nixlib-9f08904c8d0b55f56c5778f4b4e1725c71c82201.tar.bz2 nixlib-9f08904c8d0b55f56c5778f4b4e1725c71c82201.tar.lz nixlib-9f08904c8d0b55f56c5778f4b4e1725c71c82201.tar.xz nixlib-9f08904c8d0b55f56c5778f4b4e1725c71c82201.tar.zst nixlib-9f08904c8d0b55f56c5778f4b4e1725c71c82201.zip |
gnuplot: Use default compiler on Darwin
-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; }; |