weston: fix build by updating (after wayland update)

Also add dbus support, which seemed potentionally important to me.
This commit is contained in:
Vladimír Čunát 2014-01-26 00:41:14 +01:00
parent 2f51348f4d
commit 64c44fa508

View File

@ -1,20 +1,20 @@
{ stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon { stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon
, cairo, libxcb, libXcursor, x11, udev, libdrm, mtdev , cairo, libxcb, libXcursor, x11, udev, libdrm, mtdev
, libjpeg, pam, autoconf, automake, libtool }: , libjpeg, pam, autoconf, automake, libtool, dbus }:
let version = "1.3.1"; in let version = "1.4.0"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "weston-${version}"; name = "weston-${version}";
src = fetchurl { src = fetchurl {
url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
sha256 = "1isvh66irrz707r69495767n5yxp07dvy0xx6mj1mbj1n4s1657p"; sha256 = "0r7dz72ys9p3f697ajgmihkar2da36bnjna6yanb3kg9k2fk38kl";
}; };
buildInputs = [ buildInputs = [
pkgconfig wayland mesa libxkbcommon pkgconfig wayland mesa libxkbcommon
cairo libxcb libXcursor x11 udev libdrm mtdev libjpeg pam cairo libxcb libXcursor x11 udev libdrm mtdev libjpeg pam dbus.libs
]; ];
NIX_CFLAGS_COMPILE = "-I${libdrm}/include/libdrm"; NIX_CFLAGS_COMPILE = "-I${libdrm}/include/libdrm";