public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update weston: add xwayland support

Browse Source
This commit is contained in:
David Virgilio 2014-11-20 05:40:37 -06:00
parent 9a2b2e7b34
commit 1d131a09a4
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/window-managers/weston/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon, cairo, libxcb { stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon, cairo, libxcb
, libXcursor, x11, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput , libXcursor, x11, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput
, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null
, libwebp ? null , libwebp ? null, xwayland ? null
}: }:
let version = "1.6.0"; in let version = "1.6.0"; in
@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
]; ];
configureFlags = [ configureFlags = [
"--enable-xwayland"
"--enable-x11-compositor" "--enable-x11-compositor"
"--enable-drm-compositor" "--enable-drm-compositor"
"--enable-wayland-compositor" "--enable-wayland-compositor"
@ -32,7 +31,10 @@ stdenv.mkDerivation rec {
"--enable-weston-launch" "--enable-weston-launch"
"--disable-setuid-install" # prevent install target to chown root weston-launch, which fails "--disable-setuid-install" # prevent install target to chown root weston-launch, which fails
] ++ stdenv.lib.optional (freerdp != null) "--enable-rdp-compositor" ] ++ stdenv.lib.optional (freerdp != null) "--enable-rdp-compositor"
++ stdenv.lib.optional (vaapi != null) "--enabe-vaapi-recorder"; ++ stdenv.lib.optional (vaapi != null) "--enabe-vaapi-recorder"
++ stdenv.lib.optional (xwayland != null) (
"--enable-xwayland " +
"--with-xserver-path=${xwayland}/bin/Xwayland");
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Reference implementation of a Wayland compositor"; description = "Reference implementation of a Wayland compositor";

1
pkgs/top-level/all-packages.nix
View File

@ -10965,6 +10965,7 @@ let
vaapi = null; vaapi = null;
libva = null; libva = null;
libwebp = null; libwebp = null;
xwayland = null;
}; };
weston = callPackage ../applications/window-managers/weston { weston = callPackage ../applications/window-managers/weston {