mautrix-{meta,signal,whatsapp}: build with goolm

After olm gained knownVulnerabilities in #334638, build these bridges using the pure-Go goolm library instead of libolm bindings.
NixOS · Aug 26, 2024 · 69f4a4c · 69f4a4c
1 parent d0e1602
commit 69f4a4c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix
@@ -2,7 +2,6 @@
 , fetchFromGitHub
 , lib
 , nixosTests
-, olm
 }:
 
 buildGoModule rec {
@@ -18,7 +17,7 @@ buildGoModule rec {
     hash = "sha256-whBqhdB2FSFfrbtGtq8v3pjXW7QMt+I0baHTXVGPWVg=";
   };
 
-  buildInputs = [ olm ];
+  tags = [ "goolm" ];
 
   vendorHash = "sha256-rP9wvF6yYW0TdQ+vQV6ZcVMxnCtqz8xRcd9v+4pYYio=";
 

diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub, olm, libsignal-ffi }:
+{ lib, buildGoModule, fetchFromGitHub, libsignal-ffi }:
 
 buildGoModule rec {
   pname = "mautrix-signal";
@@ -12,12 +12,13 @@ buildGoModule rec {
   };
 
   buildInputs = [
-    olm
     # must match the version used in https://github.com/mautrix/signal/tree/main/pkg/libsignalgo
     # see https://github.com/mautrix/signal/issues/401
     libsignal-ffi
   ];
 
+  tags = [ "goolm" ];
+
   vendorHash = "sha256-DDcz4O3RhV6OVI+qC/LkDW/UsE5jOAn5t/gmILxHx1s=";
 
   doCheck = false;

diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub, olm }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "mautrix-whatsapp";
@@ -11,7 +11,7 @@ buildGoModule rec {
     hash = "sha256-iVILI6OGndnxIVmgNcIwHA64tkv9V3OTH3YtrCyeYx4=";
   };
 
-  buildInputs = [ olm ];
+  tags = [ "goolm" ];
 
   vendorHash = "sha256-DpgkSXSLF+U6zIzJ4AF2uTcFWQQYsRgkaUTG9F+bnVk=";