summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Cioli <nicholascioli@gmail.com>2022-08-27 14:45:48 -0400
committerGitHub <noreply@github.com>2022-08-27 21:45:48 +0300
commitdf4c1c02a67c050598f3200499cd2b1d72175966 (patch)
treeb33c56c5464fb01569b123f4497c7dbdcb0c8b31
parent812250582584f6ab1555fff98591f03ce0f2e5b3 (diff)
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.
-rw-r--r--nix/default.nix2
1 files changed, 1 insertions, 1 deletions
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")
];