Skip to content

Linux + iPhone Continuity / iMessage / SMS

fix(nix): register native host with Thunderbird

Aaron Bellfbd50018fbec
diff --git a/nix/module-test.nix b/nix/module-test.nix
index 4312ce2..828e2db 100644
--- a/nix/module-test.nix
+++ b/nix/module-test.nix
@@ -26,6 +26,7 @@ let
};
config = evaluated.config;
tether = config.programs.tether.package;
+ thunderbird = config.programs.thunderbird.package;
baseOnlyConfig =
(lib.nixosSystem {
inherit system;
@@ -72,6 +73,7 @@ let
in
assert lib.elem tether config.environment.systemPackages;
assert lib.elem tether config.programs.firefox.nativeMessagingHosts.packages;
+assert !config.programs.thunderbird.enable;
assert config.environment.etc ? "chromium/native-messaging-hosts/com.tether.extension.json";
assert config.environment.etc ? "opt/chrome/native-messaging-hosts/com.tether.extension.json";
assert config.services.avahi.enable;
@@ -93,5 +95,15 @@ assert config.hardware.bluetooth.settings.General.Experimental;
assert config.systemd.services ? "tether-btclass@hci0";
assert config.systemd.services ? "tether-btclass@hci1";
pkgs.runCommand "tether-module-test" { } ''
+ export HOME="$TMPDIR/home"
+ export MOZ_HOME="$TMPDIR/mozilla"
+
+ ${thunderbird}/bin/thunderbird --version
+
+ manifest="$MOZ_HOME/native-messaging-hosts/com.tether.extension.json"
+ test -L "$manifest"
+ test "$(readlink "$manifest")" = \
+ "${tether}/lib/mozilla/native-messaging-hosts/com.tether.extension.json"
+
touch "$out"
''
diff --git a/nix/module.nix b/nix/module.nix
index d0bc7d7..d0f562c 100644
--- a/nix/module.nix
+++ b/nix/module.nix
@@ -58,6 +58,11 @@ in
(lib.mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
programs.firefox.nativeMessagingHosts.packages = [ cfg.package ];
+ programs.thunderbird.package = lib.mkDefault (
+ pkgs.thunderbird.override {
+ nativeMessagingHosts = [ cfg.package ];
+ }
+ );
environment.etc = {
"chromium/native-messaging-hosts/com.tether.extension.json".source =
"${cfg.package}/etc/chromium/native-messaging-hosts/com.tether.extension.json";