Commit Graph

3 Commits

Author SHA1 Message Date
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
5299c1f6fb svn merge ^/nixpkgs/trunk
- 1 conflict (gnome-doc-utils)
- final merge before --reintegrate

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500
2012-03-31 20:01:40 +00:00
Yury G. Kudryashov
3d0b778848 Move gnome-doc-utils and gtk-doc to top-level
Add compatibility attrs.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33252
2012-03-19 04:36:41 +00:00