diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-12-25 09:08:10 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-12-25 09:25:05 +0100 |
| commit | 081e5c8387b957e8d6b6c174321a93a30f323650 (patch) | |
| tree | add41f04be912e7fd37447aa555d7745e82d27b2 /pkgs/applications/window-managers/weston | |
| parent | 597373bbd5ca3237f3b198c150cf7dbb63183fb1 (diff) | |
| parent | 1d131a09a42c47630248a75180882885d33d33b1 (diff) | |
| download | nixpkgs-081e5c8387b957e8d6b6c174321a93a30f323650.tar nixpkgs-081e5c8387b957e8d6b6c174321a93a30f323650.tar.gz nixpkgs-081e5c8387b957e8d6b6c174321a93a30f323650.tar.bz2 nixpkgs-081e5c8387b957e8d6b6c174321a93a30f323650.tar.lz nixpkgs-081e5c8387b957e8d6b6c174321a93a30f323650.tar.xz nixpkgs-081e5c8387b957e8d6b6c174321a93a30f323650.tar.zst nixpkgs-081e5c8387b957e8d6b6c174321a93a30f323650.zip | |
Merge #5061: add xwayland
Also resolve minor nitpicks -- *during* the merge commit.
Diffstat (limited to 'pkgs/applications/window-managers/weston')
| -rw-r--r-- | pkgs/applications/window-managers/weston/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 9a6708f1b14..c78f7d2d241 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,7 +1,8 @@ { 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 +# beware of null defaults, as the parameters *are* supplied by callPackage by default }: let version = "1.6.0"; in @@ -21,7 +22,6 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--enable-xwayland" "--enable-x11-compositor" "--enable-drm-compositor" "--enable-wayland-compositor" @@ -32,7 +32,11 @@ 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.optionals (xwayland != null) [ + "--enable-xwayland" + "--with-xserver-path=${xwayland}/bin/Xwayland" + ]; meta = with stdenv.lib; { description = "Reference implementation of a Wayland compositor"; |