From 98245cb2f16ad7df0d252200900fff66d12b3063 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 26 Nov 2023 15:03:40 +0100 Subject: [PATCH] sonic-server: fix build with clang 16 https://github.com/valeriansaliou/sonic/pull/316 --- pkgs/servers/search/sonic-server/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/search/sonic-server/default.nix b/pkgs/servers/search/sonic-server/default.nix index f98e4fbfe232..ff8ef63ef0e9 100644 --- a/pkgs/servers/search/sonic-server/default.nix +++ b/pkgs/servers/search/sonic-server/default.nix @@ -1,6 +1,8 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub +, fetchpatch , nix-update-script , nixosTests , testers @@ -18,7 +20,17 @@ rustPlatform.buildRustPackage rec { hash = "sha256-V97K4KS46DXje4qKA11O9NEm0s13aTUnM+XW8lGc6fo="; }; - cargoHash = "sha256-vWAFWoscV0swwrBQoa3glKXMRgdGYa+QrPprlVCP1QM="; + cargoPatches = [ + # Update rocksdb to 0.21 to fix compilation issues against clang 16, see: + # https://github.com/valeriansaliou/sonic/issues/315 + # https://github.com/valeriansaliou/sonic/pull/316 + (fetchpatch { + url = "https://github.com/valeriansaliou/sonic/commit/81d5f1efec21ef8b911ed3303fcbe9ca6335f562.patch"; + hash = "sha256-nOvHThTc2L3UQRVusUsD/OzbSkhSleZc6n0WyZducHM="; + }) + ]; + + cargoHash = "sha256-k+gPCkf8DCnuv/aLXcQwjmsDUu/eqSEqKXlUyj8bRq8="; # Found argument '--test-threads' which wasn't expected, or isn't valid in this context doCheck = false;