Commit graph

5 commits

Author SHA1 Message Date
Vladimír Čunát 4e7741d694 gtk2 platform: minor updates
Also make glib use libelf (a few hudred kBs).
2013-03-29 02:01:03 +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 6331d32267 rename the expressions of some gtk-related libraries
now the default (and usually only) version is called default
2013-01-29 16:48:23 +01:00
Eelco Dolstra cb1b3a0dbe * Removed an unused glib.
svn path=/nixpkgs/trunk/; revision=17989
2009-10-28 13:07:44 +00:00
Marc Weber 9e83312bd1 svn path=/nixpkgs/trunk/; revision=11461 2008-04-04 16:58:19 +00:00