From e326bc9b3f7d7ffa45ab0b71e2fdbecb71d2ed6b Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 16 Aug 2022 02:37:45 -0700 Subject: [PATCH] signalbackup-tools: 20220711 -> 20220810 (#185963) --- .../signalbackup-tools/default.nix | 43 ++++++++++++------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 439143a10a1e..04dcd6eeb4c0 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -1,35 +1,48 @@ -{ lib, stdenv, fetchFromGitHub, openssl, sqlite }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, openssl, sqlite }: stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20220711"; + version = "20220810"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - sha256 = "sha256-dKU8oTQ6ECwycDN3k7NY/pKpNWH16ceJIFDnRNEA90c="; + sha256 = "sha256-z/RAvNUss9rNuBQvxjJQl66ZMrlxvmS9at8L/vSG0XU="; }; - buildInputs = [ openssl sqlite ]; - buildFlags = [ - "-Wall" - "-Wextra" - "-Wshadow" - "-Wold-style-cast" - "-Woverloaded-virtual" - "-pedantic" - "-std=c++2a" - "-O3" - "-march=native" + # TODO: Remove when updating to next release. + patches = [ + (fetchpatch { + name = "fix-platform-checks.patch"; + url = "https://github.com/bepaald/signalbackup-tools/compare/20220810..a81baf25b6ba63da7d30d9a239e5b4bbc8d1ab4f.patch"; + sha256 = "sha256-i7fuPBil8zB+V3wHHdcbmP79OZoTfG2ZpXPQ3m7X06c="; + }) ]; + + postPatch = '' + patchShebangs BUILDSCRIPT_MULTIPROC.bash44 + ''; + + buildInputs = [ openssl sqlite ]; + + # Manually define `CXXFLAGS` and `LDFLAGS` on Darwin since the build scripts includes flags + # that don't work on Darwin. buildPhase = '' - $CXX $buildFlags */*.cc *.cc -lcrypto -lsqlite3 -o signalbackup-tools + runHook preBuild + '' + lib.optionalString stdenv.isDarwin '' + export CXXFLAGS="-Wall -Wextra -Wshadow -Wold-style-cast -Woverloaded-virtual -pedantic -O3" + export LDFLAGS="-Wall -Wextra -O3" + '' + '' + ./BUILDSCRIPT_MULTIPROC.bash44 + runHook postBuild ''; installPhase = '' + runHook preInstall mkdir -p $out/bin cp signalbackup-tools $out/bin/ + runHook postInstall ''; meta = with lib; {