Commit graph

21 commits

Author SHA1 Message Date
Vladimír Čunát ec3965d8d0 Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Carles Pagès 33798a9a08 wxGTK: remove reference to mesa_noglu
This is no longer needed since unifying mesa(noglu) and glu in a mesa buildEnv.
2013-03-24 12:47:16 +01:00
Vladimír Čunát 0d72174dbd Merge branch stdenv-updates into x-updates
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
2013-02-21 12:43:00 +01:00
Vladimír Čunát f549fc477d wxGTK28: fix building + minor update 2013-02-01 01:34:12 +01:00
Eelco Dolstra ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Yury G. Kudryashov fe1115caf4 Make nixpkgs ready for gst_all attrset removal
svn path=/nixpkgs/trunk/; revision=33092
2012-03-14 22:44:52 +00:00
Lluís Batlle i Rossell b3456f8bdd Making mesa optional in wxGTK, and using on non-linux the non-mesa wxGTK for gnuplot and wxmaxima.
That may make them build further.


svn path=/nixpkgs/trunk/; revision=33051
2012-03-13 21:54:17 +00:00
Peter Simons dd90ec0d92 wxGTK-2.x: enable support for media control
svn path=/nixpkgs/trunk/; revision=31516
2012-01-13 10:32:02 +00:00
Peter Simons 6284c83b15 wxGTK-2.x: enable parallel building
svn path=/nixpkgs/trunk/; revision=31515
2012-01-13 10:31:58 +00:00
Peter Simons 1585c62857 pkgs/development/libraries/wxGTK-2.8: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=31514
2012-01-13 10:31:56 +00:00
Yury G. Kudryashov 83a44e5a65 wxGTK: rely on gtk.propagatedBuildInputs
gtkLibs224.gtk actually propagates libpng etc. through gdk_pixbuf,
so using gtk.libpng etc. makes no sense.

Remove unused 'inherit lib*;' in gtk.

svn path=/nixpkgs/trunk/; revision=29383
2011-09-20 06:22:39 +00:00
Eelco Dolstra 5c244c345d * wxGTK updated to 2.8.12.
svn path=/nixpkgs/trunk/; revision=27119
2011-05-03 16:01:19 +00:00
Lluís Batlle i Rossell 2c8783a48b Making wxGTK stay wxGTK even cross-built, so I remove the wxMSW code I added
to test the crossbuilding with wxGTK.
I added a new windows-specific package: wxMSW.

svn path=/nixpkgs/trunk/; revision=21634
2010-05-06 19:19:22 +00:00
Lluís Batlle i Rossell 24c157910c Making wxWidgets cross-build for mingw32.
svn path=/nixpkgs/trunk/; revision=21631
2010-05-06 18:23:03 +00:00
Lluís Batlle i Rossell 3fe67eca31 Updating wxGTK 2.8
svn path=/nixpkgs/trunk/; revision=21398
2010-04-28 10:09:40 +00:00
Lluís Batlle i Rossell c4c6c2a224 Fixing wxGTK build in x86_64 (mesa related)
svn path=/nixpkgs/trunk/; revision=15623
2009-05-16 13:53:26 +00:00
Lluís Batlle i Rossell 305517fb81 Updating wxGTK from 2.8.4 to 2.8.10
svn path=/nixpkgs/trunk/; revision=14767
2009-03-29 21:15:17 +00:00
Lluís Batlle i Rossell 8e2956c4cb Fixing wxGTK28 for x86_64, for the mesa references.
svn path=/nixpkgs/trunk/; revision=14454
2009-03-09 10:42:24 +00:00
Lluís Batlle i Rossell 50d8df47b2 Making wxGTK-2.8 to provide wxGLCanvas. Adding dependence on mesa.
svn path=/nixpkgs/trunk/; revision=13831
2009-01-24 21:00:53 +00:00
Eelco Dolstra 607b0d3e80 * Rewrite all the SourceForge URLs to mirror://sourceforge/.
find . -name "*.nix" | while read fn; do sed 's^http://[a-z]*.dl.sourceforge.net/sourceforge/^mirror://sourceforge/^g' < $fn > $fn.new; mv $fn.new $fn; done

svn path=/nixpkgs/trunk/; revision=9198
2007-08-27 13:01:33 +00:00
Eelco Dolstra d16ae4efcf * Added wxGTK/wxPython 2.8. However this was quite pointless as
Bittorrent is even more broken with wxPython 2.8.

svn path=/nixpkgs/trunk/; revision=8812
2007-05-31 13:43:13 +00:00