weston: 1.5.0 -> 1.6.0

This commit is contained in:
William A. Kennington III 2014-10-17 14:26:36 -07:00
parent c79eac4c79
commit e7c1c1d97a
2 changed files with 37 additions and 15 deletions

View File

@ -1,33 +1,44 @@
{ stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon
, cairo, libxcb, libXcursor, x11, udev, libdrm, mtdev
, libjpeg, pam, autoconf, automake, libtool, dbus }:
{ stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon, cairo, libxcb
, libXcursor, x11, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput
, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null
, libwebp ? null
}:
let version = "1.5.0"; in
let version = "1.6.0"; in
stdenv.mkDerivation rec {
name = "weston-${version}";
src = fetchurl {
url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
sha256 = "113nig2dmbgrjhi79k0zw77vicnx8vkaihawd0nsg6n79ah8nf06";
sha256 = "0kb1mb54l7adihmr2y77xgsdb00dvifnq886q2mmy0mz7g8sagnw";
};
#ToDo: libinput can be split away
buildInputs = [
pkgconfig wayland mesa libxkbcommon
cairo libxcb libXcursor x11 udev libdrm mtdev libjpeg pam dbus.libs
pkgconfig wayland mesa libxkbcommon cairo libxcb libXcursor x11 udev libdrm
mtdev libjpeg pam dbus.libs libinput pango libunwind freerdp vaapi libva
libwebp
];
NIX_CFLAGS_COMPILE = "-I${libdrm}/include/libdrm";
configureFlags = [
"--enable-xwayland"
"--enable-x11-compositor"
"--enable-drm-compositor"
"--enable-wayland-compositor"
"--enable-headless-compositor"
"--enable-fbdev-compositor"
"--enable-screen-sharing"
"--enable-clients"
"--enable-weston-launch"
"--disable-setuid-install" # prevent install target to chown root weston-launch, which fails
];
] ++ stdenv.lib.optional (freerdp != null) "--enable-rdp-compositor"
++ stdenv.lib.optional (vaapi != null) "--enabe-vaapi-recorder";
meta = {
meta = with stdenv.lib; {
description = "Reference implementation of a Wayland compositor";
homepage = http://wayland.freedesktop.org/;
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.linux;
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ wkennington ];
};
}

View File

@ -10602,7 +10602,18 @@ let
weechatDevel = lowPrio (callPackage ../applications/networking/irc/weechat/devel.nix { });
weston = callPackage ../applications/window-managers/weston { };
westonLite = callPackage ../applications/window-managers/weston {
pango = null;
freerdp = null;
libunwind = null;
vaapi = null;
libva = null;
libwebp = null;
};
weston = callPackage ../applications/window-managers/weston {
freerdp = freerdpUnstable;
};
windowmaker = callPackage ../applications/window-managers/windowmaker { };