diff options
| author | David Virgilio <drvirgilio@gmail.com> | 2014-11-20 05:40:37 -0600 |
|---|---|---|
| committer | David Virgilio <drvirgilio@gmail.com> | 2014-11-20 06:21:47 -0600 |
| commit | 1d131a09a42c47630248a75180882885d33d33b1 (patch) | |
| tree | 04bf951b81f68ea50832568b5080c4adf05d2a65 /pkgs/applications/window-managers/weston | |
| parent | 9a2b2e7b34190f553f41aa80297acf383700a19d (diff) | |
update weston: add xwayland support
Diffstat (limited to 'pkgs/applications/window-managers/weston')
| -rw-r--r-- | pkgs/applications/window-managers/weston/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 9a6708f1b14..a270bb8d466 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,7 +1,7 @@ { 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 +, libwebp ? null, xwayland ? null }: let version = "1.6.0"; in @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--enable-xwayland" "--enable-x11-compositor" "--enable-drm-compositor" "--enable-wayland-compositor" @@ -32,7 +31,10 @@ stdenv.mkDerivation rec { "--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"; + ++ 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; { description = "Reference implementation of a Wayland compositor"; |