diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-05-22 01:49:20 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-05-24 18:14:22 +0000 |
| commit | 32bd8a47d876b4bf9877eaa4fae2b44826da8281 (patch) | |
| tree | 2452f515271a47666febe45e7f7911575faba881 | |
| parent | buildMozillaMach: Clean up Google API key configuration (diff) | |
| download | nixpkgs-32bd8a47d876b4bf9877eaa4fae2b44826da8281.tar.gz | |
buildMozillaMach: set geo.provider.network.url for new profiles.
Use Mozilla Location Service as geolocation provider for new profiles,
since our Google API key does not seem to work for geolocation at this
time.
Related: https://github.com/NixOS/nixpkgs/issues/173758
(cherry picked from commit 2d97db78736a4b60f4c6ab39350fa07fedc8ab3c)
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 74833f242c73..06bfddd1d8d9 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -186,6 +186,18 @@ let }; }); + defaultPrefs = { + "geo.provider.network.url" = { + value = "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"; + reason = "Use MLS by default for geolocation, since our Google API Keys are not working"; + }; + }; + + defaultPrefsFile = pkgs.writeText "nixos-default-prefs.js" (lib.concatStringsSep "\n" (lib.mapAttrsToList (key: value: '' + // ${value.reason} + pref("${key}", ${builtins.toJSON value.value}); + '') defaultPrefs)); + in buildStdenv.mkDerivation ({ @@ -474,6 +486,7 @@ buildStdenv.mkDerivation ({ postInstall = '' # Install distribution customizations install -Dvm644 ${distributionIni} $out/lib/${binaryName}/distribution/distribution.ini + install -Dvm644 ${defaultPrefsFile} $out/lib/${binaryName}/browser/defaults/preferences/nixos-default-prefs.js '' + lib.optionalString buildStdenv.isLinux '' # Remove SDK cruft. FIXME: move to a separate output? |