about summary refs log tree commit diff
path: root/nixpkgs
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-04-21 01:27:06 +0000
committerAlyssa Ross <hi@alyssa.is>2019-04-23 10:11:43 +0000
commit929854bd47bfcd2d7112ab1c0ed1a295af3fc7cc (patch)
tree03400ce9c9511a8b919f07ee9eff602cfed648d5 /nixpkgs
parent6d8e80e90dc9d8fbb2436fc053ac3e9f6402db3c (diff)
downloadnixlib-929854bd47bfcd2d7112ab1c0ed1a295af3fc7cc.tar
nixlib-929854bd47bfcd2d7112ab1c0ed1a295af3fc7cc.tar.gz
nixlib-929854bd47bfcd2d7112ab1c0ed1a295af3fc7cc.tar.bz2
nixlib-929854bd47bfcd2d7112ab1c0ed1a295af3fc7cc.tar.lz
nixlib-929854bd47bfcd2d7112ab1c0ed1a295af3fc7cc.tar.xz
nixlib-929854bd47bfcd2d7112ab1c0ed1a295af3fc7cc.tar.zst
nixlib-929854bd47bfcd2d7112ab1c0ed1a295af3fc7cc.zip
sway: only use Xwayland if supported by wlroots
Diffstat (limited to 'nixpkgs')
-rw-r--r--nixpkgs/pkgs/applications/window-managers/sway/default.nix9
1 files changed, 5 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/applications/window-managers/sway/default.nix b/nixpkgs/pkgs/applications/window-managers/sway/default.nix
index 08eb16999991..379bfa71ce33 100644
--- a/nixpkgs/pkgs/applications/window-managers/sway/default.nix
+++ b/nixpkgs/pkgs/applications/window-managers/sway/default.nix
@@ -5,6 +5,7 @@
 , wlroots, wayland-protocols
 
 , gdkPixbufSupport ? true, gdk_pixbuf
+, xwaylandSupport ? lib.elem "-Dxwayland=enabled" wlroots.mesonFlags
 }:
 
 stdenv.mkDerivation rec {
@@ -38,10 +39,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  mesonFlags = [
-    "-Ddefault-wallpaper=false" "-Dxwayland=enabled"
-    "-Dtray=enabled" "-Dman-pages=enabled"
-  ] ++ lib.optional gdkPixbufSupport "-Dgdk-pixbuf=enabled";
+  mesonFlags =
+    [ "-Ddefault-wallpaper=false" "-Dtray=enabled" "-Dman-pages=enabled" ]
+    ++ lib.optional gdkPixbufSupport "-Dgdk-pixbuf=enabled"
+    ++ lib.optional xwaylandSupport "-Dxwayland=disabled";
 
   meta = with lib; {
     description = "i3-compatible tiling Wayland compositor";