Commit Graph

6 Commits

Author SHA1 Message Date
Carles Pagès
d32a973fc9 Merge remote-tracking branch 'upstream/x-updates' into wayland
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/wayland/default.nix
2013-02-18 20:15:59 +01:00
Carles Pagès
bd8428efa1 wayland: update to 1.0.5.
Also updated weston to 1.0.5, and got rid of the patch that's no longer needed.
They fixed it upstream even if it was actually caused by our pkg-config patch.
2013-02-18 19:57:27 +01:00
Shea Levy
2a1c308607 Add wayland library 2013-02-16 23:06:31 -05:00
Carles Pagès
bc9a291779 wayland: update to 1.0.4.
Also updated weston to 1.0.4, which now fails to build. Doh!
2013-01-28 19:45:07 +01:00
Carles Pagès
a53a7bc0e4 Update wayland and weston to 1.0.3.
I also removed the screenshooter-client-protocol patch as this was fixed
upstream.
2013-01-08 23:21:36 +01:00
Carles Pagès
4b87cc9583 Add wayland 1.0.2. 2012-12-02 11:20:07 +01:00