From df4c1c02a67c050598f3200499cd2b1d72175966 Mon Sep 17 00:00:00 2001 From: Nicholas Cioli Date: Sat, 27 Aug 2022 14:45:48 -0400 Subject: [PATCH] fix xwayland config option for nix (#587) When building Hyprland in nix using the following home-manager recipe: ```nix wayland.windowManager.hyprland = { enable = true; xwayland = false; }; ``` The default nix configuration still makes reference to a compile argument `NO_XWAYLAND`, but the `meson_options.txt` only makes reference to `xwayland`. This causes the build to fail with: ``` meson.build:1:0: ERROR: Unknown options: "NO_XWAYLAND" ``` This change fixes that issue. This still doesn't allow you to build Hyprland without having XWayland installed (#178), but it should at least allow for valid nix configurations for when that issue gets resolved. --- nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/default.nix b/nix/default.nix index ffea6e0c..3bec375d 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation { else "release"; mesonFlags = builtins.concatLists [ - (lib.optional (!enableXWayland) "-DNO_XWAYLAND=true") + (lib.optional (!enableXWayland) "-Dxwayland=disabled") (lib.optional legacyRenderer "-DLEGACY_RENDERER:STRING=true") ];