From f8dd4b46ccc97a15a623c7a3833239d12b1e6e98 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Fri, 24 Nov 2023 07:16:59 +0100 Subject: [PATCH] xdg-desktop-portal: fix disabling Geo location MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The "geoclue" Meson option is defined to have type "feature", which means that the set of possible options is "enabled", "disabled" or "auto". We pass "false" though when the user has disabled Geo location support, which is wrong and causes the build to fail: > meson.build:1:0: ERROR: Value "false" (of type "string") for combo option "Enable Geoclue support. Needed for location portal" is not one of the choices. Possible choices are (as string): "enabled", "disabled", "auto". This broke in c585543ccd50 (xdg-desktop-portal: 1.16.0 → 1.17.0, 2023-08-08) where we started using the new Meson-based build system instead of the autotools-based one. Fix it by using "disabled" instead. --- pkgs/development/libraries/xdg-desktop-portal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 18b42132e00b..8dea84aac453 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dinstalled-tests=true" "-Dinstalled_test_prefix=${placeholder "installedTests"}" ] ++ lib.optionals (!enableGeoLocation) [ - "-Dgeoclue=false" + "-Dgeoclue=disabled" ]; doCheck = true;