diff options
author | William A. Kennington III <william@wkennington.com> | 2014-10-17 14:26:36 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2014-10-17 14:26:45 -0700 |
commit | e7c1c1d97a3fcdd474ea52c5f8eb4e8300375595 (patch) | |
tree | 39d3bcc505bfd7fd81116e10be7db923d71ba451 /pkgs/applications/window-managers/weston | |
parent | c79eac4c79aea941d6040e68bb3890db34c31073 (diff) |
weston: 1.5.0 -> 1.6.0
Diffstat (limited to 'pkgs/applications/window-managers/weston')
-rw-r--r-- | pkgs/applications/window-managers/weston/default.nix | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 73a6412afab..9a6708f1b14 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -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 ]; }; } |