Remove builderDefs magic, add meta Cherry-pick r31382 from branches/libpng15 svn path=/nixpkgs/trunk/; revision=31385