Commit graph

10 commits

Author SHA1 Message Date
Vladimír Čunát
b89ab32c60 cogl: fix build, enable some features 2013-12-23 19:25:29 +01:00
Vladimír Čunát
4c5a71f777 Merge master into x-updates
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
2013-12-18 23:21:29 +01:00
Roelof Wobben
a2c48451a2 enabled introspection for clutter,cogl and json-glib 2013-12-12 19:41:51 +01:00
Vladimír Čunát
7e9b24c8f1 cogl, clutter: update to 1.16.{0,2} 2013-12-05 22:52:29 +01:00
Eelco Dolstra
2147a07938 Fix a bunch of Hydra evaluation errors 2013-10-07 17:36:47 +02:00
Jason \"Don\" O'Conal
63051ab66b cogl: fix build on darwin (close #924) 2013-09-06 16:13:54 +02: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
Eelco Dolstra
d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +00:00
Yury G. Kudryashov
69f2dfe7da cogl-1.8.2
svn path=/nixpkgs/trunk/; revision=31362
2012-01-06 18:13:43 +00:00
Yury G. Kudryashov
13a3365d4a Add cogl
svn path=/nixpkgs/trunk/; revision=30291
2011-11-07 16:48:05 +00:00