Merge pull request #270147 from anthonyroussel/zhf-fix/sonic-server

sonic-server: fix build with clang 16
This commit is contained in:
Mario Rodas 2023-11-27 20:02:05 -05:00 committed by GitHub
commit 693668dbb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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;