public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simpler code, to try to use wxGTK without mesa for non-linux.

Browse Source 
svn path=/nixpkgs/trunk/; revision=33052
This commit is contained in:
Lluís Batlle i Rossell 2012-03-13 21:56:24 +00:00
parent b3456f8bdd
commit 12cfef03f8
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/top-level/all-packages.nix
View File

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