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";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b8dbe4c7b41..84bbbdc728c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10965,6 +10965,7 @@ let
     vaapi = null;
     libva = null;
     libwebp = null;
+    xwayland = null;
   };
 
   weston = callPackage ../applications/window-managers/weston {