Commit b7391c69 authored by Malo Bourgon's avatar Malo Bourgon
Browse files

signalbackup-tools: unbreak on Darwin systems

parent 7a734f27
Loading
Loading
Loading
Loading
+6 −3
Original line number Diff line number Diff line
{ lib, stdenv, fetchFromGitHub, openssl, sqlite }:
{ lib, stdenv, clang14Stdenv, fetchFromGitHub, openssl, sqlite }:

stdenv.mkDerivation rec {
(if stdenv.isDarwin then clang14Stdenv else stdenv).mkDerivation rec {
  pname = "signalbackup-tools";
  version = "20230223-1";

@@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
    hash = "sha256-tBjMg+aYXmIhS2tw+D5NkBieWKiWwEVBWs6LA3rFaQQ=";
  };

  patches = [
    ./fix-build-darwin-clang14.patch
  ];

  postPatch = ''
    patchShebangs BUILDSCRIPT_MULTIPROC.bash44
  '';
@@ -36,6 +40,5 @@ stdenv.mkDerivation rec {
    license = licenses.gpl3Only;
    maintainers = [ maintainers.malo ];
    platforms = platforms.all;
    broken = stdenv.isDarwin;
  };
}
+13 −0
Original line number Diff line number Diff line
diff --git a/signalbackup/signalbackup.h b/signalbackup/signalbackup.h
index e9fc3fb..a620571 100644
--- a/signalbackup/signalbackup.h
+++ b/signalbackup/signalbackup.h
@@ -148,7 +148,7 @@ class SignalBackup
     std::string pre;
     std::string replacement;
     std::string post;
-    bool operator<(Range const &other)
+    bool operator<(Range const &other) const
     {
       return (start < other.start) ||
         (start == other.start && start + length < other.start + other.length) ||