From 12cfef03f8c5a17e2750c5a3c147620999e7e49a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 13 Mar 2012 21:56:24 +0000
Subject: [PATCH] Simpler code, to try to use wxGTK without mesa for non-linux.

svn path=/nixpkgs/trunk/; revision=33052
---
 pkgs/top-level/all-packages.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0499463c3e..4ed337a1acd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -766,7 +766,6 @@ let
 
   gnuplot = callPackage ../tools/graphics/gnuplot {
     inherit (gtkLibs) pango;
-    wxGTK = if stdenv.isLinux then wxGTK else wxGTK.override { withMesa = false; };
     texLive = null;
     lua = null;
   };
@@ -4793,6 +4792,7 @@ let
     inherit (gtkLibs) gtk;
     inherit (gst_all) gstreamer gstPluginsBase;
     inherit (gnome) GConf;
+    withMesa = stdenv.isLinux;
   };
 
   wxGTK290 = callPackage ../development/libraries/wxGTK-2.9/2.9.0.nix {
@@ -8306,9 +8306,7 @@ let
 
   maxima = callPackage ../applications/science/math/maxima { };
 
-  wxmaxima = callPackage ../applications/science/math/wxmaxima {
-    wxGTK = if stdenv.isLinux then wxGTK else wxGTK.override { withMesa = false; };
-  };
+  wxmaxima = callPackage ../applications/science/math/wxmaxima { };
 
   pari = callPackage ../applications/science/math/pari {};