Commit 78d87d6f authored by Patrick Steinhardt's avatar Patrick Steinhardt Committed by github-actions[bot]
Browse files

xdg-desktop-portal: fix disabling Geo location 

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 c585543c (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.

(cherry picked from commit f8dd4b46)
parent 757c42d7

pkgs/development/libraries/xdg-desktop-portal/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: { 
    "-Dinstalled-tests=true"

    "-Dinstalled_test_prefix=${placeholder "installedTests"}"

  ] ++ lib.optionals (!enableGeoLocation) [

    "-Dgeoclue=false"

    "-Dgeoclue=disabled"

  ];



  doCheck = true;