From 13d4678f73f10d199be768d05df55fb68ca94731 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Mon, 4 Nov 2024 17:26:36 +0100 Subject: [PATCH 1/3] mautrix-signal: fix build with goolm enabled When building with goolm support, libstdc++ must be linked, as libsignal-ffi depends on it being linked. When building with (deprecated) libolm, it's pulled in transitively, it seems -- and it that case, this is effectively a no-op. Signed-off-by: Christoph Heiss --- pkgs/servers/mautrix-signal/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index 0b21bd539d1d..2d657d23aeb5 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, fetchpatch, @@ -32,13 +33,19 @@ buildGoModule rec { }) ]; - buildInputs = (lib.optional (!withGoolm) 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 - ]; + buildInputs = + (lib.optional (!withGoolm) olm) + ++ (lib.optional withGoolm stdenv.cc.cc.lib) + ++ [ + # 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 = lib.optional withGoolm "goolm"; + CGO_LDFLAGS = lib.optional withGoolm [ "-lstdc++" ]; + vendorHash = "sha256-bKQKO5RqgMrWq7NyNF1rj2CLp5SeBP80HWxF8MWnZ1U="; doCheck = false; From 9e1572824162b02e4fff522cf894d9134c6f4c54 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Tue, 5 Nov 2024 00:24:44 +0100 Subject: [PATCH 2/3] mautrix-signal: enable checks Signed-off-by: Christoph Heiss --- pkgs/servers/mautrix-signal/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index 2d657d23aeb5..e9cd4501d7b6 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -48,7 +48,20 @@ buildGoModule rec { vendorHash = "sha256-bKQKO5RqgMrWq7NyNF1rj2CLp5SeBP80HWxF8MWnZ1U="; - doCheck = false; + doCheck = true; + preCheck = + '' + # Needed by the tests to be able to find libstdc++ + export LD_LIBRARY_PATH="${stdenv.cc.cc.lib}/lib:$LD_LIBRARY_PATH" + '' + + (lib.optionalString (!withGoolm) '' + # When using libolm, the tests need explicit linking to libstdc++ + export CGO_LDFLAGS="-lstdc++" + ''); + + postCheck = '' + unset LD_LIBRARY_PATH + ''; meta = with lib; { homepage = "https://github.com/mautrix/signal"; From 218ad1bf6ab44b5553165f4c524460bded982e9e Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Tue, 5 Nov 2024 13:37:07 +0100 Subject: [PATCH 3/3] mautrix-signal: add version test Signed-off-by: Christoph Heiss --- pkgs/servers/mautrix-signal/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index e9cd4501d7b6..60ce7a9cc13e 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -6,6 +6,7 @@ fetchpatch, olm, libsignal-ffi, + versionCheckHook, # This option enables the use of an experimental pure-Go implementation of # the Olm protocol instead of libolm for end-to-end encryption. Using goolm # is not recommended by the mautrix developers, but they are interested in @@ -63,6 +64,10 @@ buildGoModule rec { unset LD_LIBRARY_PATH ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = [ "--version" ]; + meta = with lib; { homepage = "https://github.com/mautrix/signal"; description = "Matrix-Signal puppeting bridge";