From 4c60d76395e47a40e4754bc9cf5221a1dbbf2748 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Mon, 23 Feb 2026 09:28:06 -0500 Subject: [PATCH 1/2] wlroots: use lib.mesonEnable --- pkgs/development/libraries/wlroots/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 5756580d1680..88b6304871ed 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -105,7 +105,9 @@ let ++ lib.optional finalAttrs.enableXWayland xwayland ++ extraBuildInputs; - mesonFlags = lib.optional (!finalAttrs.enableXWayland) "-Dxwayland=disabled"; + mesonFlags = [ + (lib.mesonEnable "xwayland" finalAttrs.enableXWayland) + ]; postFixup = '' # Install ALL example programs to $examples: From cebe295fc87cd27c517635fca17cd00a4c0b123e Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Mon, 23 Feb 2026 09:34:28 -0500 Subject: [PATCH 2/2] wlroots: fix build on FreeBSD --- pkgs/development/libraries/wlroots/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 88b6304871ed..d59d4fcb5c57 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -27,6 +27,7 @@ libliftoff, libdisplay-info, lcms2, + evdev-proto, nixosTests, testers, @@ -88,7 +89,6 @@ let libliftoff libdisplay-info libGL - libcap libxkbcommon libgbm pixman @@ -102,11 +102,17 @@ let libxcb-render-util libxcb-wm ] + ++ lib.optional stdenv.hostPlatform.isLinux libcap + ++ lib.optional stdenv.hostPlatform.isFreeBSD evdev-proto ++ lib.optional finalAttrs.enableXWayland xwayland ++ extraBuildInputs; mesonFlags = [ (lib.mesonEnable "xwayland" finalAttrs.enableXWayland) + ] + # The other allocator, udmabuf, is a linux-specific API + ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ + (lib.mesonOption "allocators" "gbm") ]; postFixup = '' @@ -138,7 +144,7 @@ let inherit (finalAttrs.src.meta) homepage; changelog = "https://gitlab.freedesktop.org/wlroots/wlroots/-/tags/${version}"; license = lib.licenses.mit; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.freebsd; maintainers = with lib.maintainers; [ synthetica wineee