From 9f08904c8d0b55f56c5778f4b4e1725c71c82201 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 9 Aug 2014 19:52:33 +0200
Subject: [PATCH] gnuplot: Use default compiler on Darwin

---
 pkgs/tools/graphics/gnuplot/default.nix | 5 ++---
 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 164b3ba1d28..f92c82e3d74 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 f96fe5824ba..a165ec41ed8 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; };