[Nix-dev] Mesa (was: SVN commit: nix - r33051 - in nixpkgs/trunk/pkgs: development/libraries/wxGTK-2.8 top-level)

[Peter Simons]

Hi Lluís,

 > --- nixpkgs/trunk/pkgs/top-level/all-packages.nix	Tue Mar 13 21:48:12 2012	(r33050)
 > +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix	Tue Mar 13 21:54:17 2012	(r33051)
 > @@ -766,6 +766,7 @@
 >
 >    gnuplot = callPackage ../tools/graphics/gnuplot {
 >      inherit (gtkLibs) pango;
 > +    wxGTK = if stdenv.isLinux then wxGTK else wxGTK.override { withMesa = false; };
 >      texLive = null;
 >      lua = null;
 >    };
 > @@ -8305,7 +8306,9 @@
 >
 >    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 {};

thank you for fixing those errors! I wonder, though, whether it might be
easier to have wxGTK use a default value of

  stdenv.lib.elem stdenv.system stdenv.platforms.mesaPlatforms

for useMesa to begin with? Then there wouldn't be a need to override
things later.

Take care,
Peter