Unverified Commit 31022727 authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #270532 from NixOS/backport-270147-to-release-23.11 

[Backport release-23.11] sonic-server: fix build with clang 16
parents 7c4c2050 01b8eed3

pkgs/servers/search/sonic-server/default.nix

+13 −1
Original line number Diff line number Diff line 
{ lib

, stdenv

, rustPlatform

, fetchFromGitHub

, fetchpatch

, nix-update-script

, testers

, sonic-server
@@ -17,7 +19,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;