Also make glib use libelf (a few hudred kBs).
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)
now the default (and usually only) version is called default
svn path=/nixpkgs/trunk/; revision=17989