geoclue2: Use our own Mozilla API key

https://github.com/NixOS/nixpkgs/issues/110031#issuecomment-777078988
This commit is contained in:
Jan Tojnar 2021-04-14 02:30:43 +02:00
parent 0fc0dd22ff
commit 80e5df8b5a
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
2 changed files with 18 additions and 2 deletions

View file

@ -65,17 +65,20 @@ index fde6fa3..39b7b0a 100644
conf.set_quoted('LOCALEDIR', localedir)
-conf.set_quoted('SYSCONFDIR', sysconfdir)
+conf.set_quoted('SYSCONFDIR', get_option('sysconfdir'))
conf.set_quoted('MOZILLA_API_KEY', get_option('mozilla-api-key'))
conf.set10('GCLUE_USE_3G_SOURCE', get_option('3g-source'))
conf.set10('GCLUE_USE_CDMA_SOURCE', get_option('cdma-source'))
conf.set10('GCLUE_USE_MODEM_GPS_SOURCE', get_option('modem-gps-source'))
diff --git a/meson_options.txt b/meson_options.txt
index 83bc60e..b726329 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -34,3 +34,6 @@ option('systemd-system-unit-dir',
@@ -34,6 +34,9 @@ option('systemd-system-unit-dir',
option('dbus-srv-user',
type: 'string', value: 'root',
description: 'The user (existing) as which the service will run')
+option('sysconfdir_install',
+ type: 'string', value: '',
+ description: 'sysconfdir to use during installation')
option('mozilla-api-key',
type: 'string', value: 'geoclue',
description: 'Your API key for Mozilla Location Service')

View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitLab
, fetchpatch
, intltool
, meson
, ninja
@ -38,6 +39,17 @@ stdenv.mkDerivation rec {
};
patches = [
# Make the Mozilla API key configurable
# https://gitlab.freedesktop.org/geoclue/geoclue/merge_requests/54 (only partially backported)
(fetchpatch {
url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/95c9ad4dc176860c85a07d0db4cb4179929bdb54.patch";
sha256 = "/lq/dLBJl2vf16tt7emYoTtXY6iUw+4s2XcABUHp3Kc=";
})
(fetchpatch {
url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/1a00809a0d89b0849a57647c878d192354247a33.patch";
sha256 = "6FuiukgFWg2cEKt8LlKP4E0rfSH/ZQgk6Ip1mGJpNFQ=";
})
./add-option-for-installation-sysconfdir.patch
];
@ -77,6 +89,7 @@ stdenv.mkDerivation rec {
"-Ddemo-agent=${lib.boolToString withDemoAgent}"
"--sysconfdir=/etc"
"-Dsysconfdir_install=${placeholder "out"}/etc"
"-Dmozilla-api-key=5c28d1f4-9511-47ff-b11a-2bef80fc177c"
"-Ddbus-srv-user=geoclue"
"-Ddbus-sys-dir=${placeholder "out"}/share/dbus-1/system.d"
] ++ lib.optionals stdenv.isDarwin [