From 43f6f4e46f5e3bcf28239b4539a751070b8e5fe9 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 11 Feb 2024 11:39:54 +0000 Subject: [PATCH 1/2] urbackup-client: enable parallel building --- pkgs/applications/backup/urbackup-client/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/backup/urbackup-client/default.nix b/pkgs/applications/backup/urbackup-client/default.nix index aa63a80c480d..64acd441c442 100644 --- a/pkgs/applications/backup/urbackup-client/default.nix +++ b/pkgs/applications/backup/urbackup-client/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { "--enable-embedded-cryptopp" ]; + enableParallelBuilding = true; + meta = with lib; { description = "An easy to setup Open Source client/server backup system"; longDescription = "An easy to setup Open Source client/server backup system, that through a combination of image and file backups accomplishes both data safety and a fast restoration time"; From 4de07c15155fa4bd5859e7c34c702244c787ebfa Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 11 Feb 2024 11:46:11 +0000 Subject: [PATCH 2/2] urbackup-client: fix `gcc-13` build failure Without the change build fails on` master as https://hydra.nixos.org/build/249116447: blockalign_src/crc.cpp: In function 'bool cryptopp_crc::IsAlignedOn(const void*, unsigned int)': blockalign_src/crc.cpp:191:23: error: 'uintptr_t' does not name a type 191 | const uintptr_t x = reinterpret_cast(ptr); | ^~~~~~~~~ --- pkgs/applications/backup/urbackup-client/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/backup/urbackup-client/default.nix b/pkgs/applications/backup/urbackup-client/default.nix index 64acd441c442..ed5f59e2c41c 100644 --- a/pkgs/applications/backup/urbackup-client/default.nix +++ b/pkgs/applications/backup/urbackup-client/default.nix @@ -15,6 +15,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-n0/NVClZz6ANgEdPCtdZxsEvllIl32vwDjC2nq5R8Z4="; }; + postPatch = '' + find | fgrep crc.cpp + # Fix gcc-13 build failures due to missing includes + sed -e '1i #include ' -i \ + blockalign_src/crc.cpp + ''; + buildInputs = [ wxGTK32 zlib