add back wayland 1.5 for cogl 1.18

Wayland 1.6 removed wayland-egl.pc
This commit is contained in:
Luca Bruno 2014-11-10 00:09:55 +01:00
parent c81b6fc4b8
commit 9c997fe446
2 changed files with 26 additions and 1 deletions

View file

@ -0,0 +1,21 @@
{ stdenv, fetchurl, libffi, expat, pkgconfig, libxslt, docbook_xsl, doxygen }:
let version = "1.5.0"; in
stdenv.mkDerivation rec {
name = "wayland-${version}";
src = fetchurl {
url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
sha256 = "1da179livkkmfsds32yhh4zflxn9qs6av023702kx2w8mzly2s80";
};
buildInputs = [ pkgconfig libffi expat libxslt docbook_xsl doxygen ];
meta = {
description = "Reference implementation of the wayland protocol";
homepage = http://wayland.freedesktop.org/;
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.linux;
};
}

View file

@ -4972,7 +4972,9 @@ let
cogl = callPackage ../development/libraries/cogl { };
cogl_1_18 = callPackage ../development/libraries/cogl/1.18.nix { };
cogl_1_18 = callPackage ../development/libraries/cogl/1.18.nix {
wayland = wayland_1_5;
};
coin3d = callPackage ../development/libraries/coin3d { };
@ -7002,6 +7004,8 @@ let
};
wayland = callPackage ../development/libraries/wayland { };
wayland_1_5 = callPackage ../development/libraries/wayland/1.5.nix { };
webkit = webkitgtk;