diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-11-27 20:02:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-27 20:02:05 -0500 |
| commit | 693668dbb00a0ddbe2e381077f8038cadb721684 (patch) | |
| tree | a9d89542d708f595d18b6d206168d99770e93de3 /pkgs/servers/search | |
| parent | 8a3fed1ab184aa34c6090d6c6b290f7f5c761aef (diff) | |
| parent | 98245cb2f16ad7df0d252200900fff66d12b3063 (diff) | |
Merge pull request #270147 from anthonyroussel/zhf-fix/sonic-server
sonic-server: fix build with clang 16
Diffstat (limited to 'pkgs/servers/search')
| -rw-r--r-- | pkgs/servers/search/sonic-server/default.nix | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/servers/search/sonic-server/default.nix b/pkgs/servers/search/sonic-server/default.nix index f98e4fbfe232d..ff8ef63ef0e95 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; |