From 86500186c5a5d62af6c16cbcd0515083ae6d7e06 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Thu, 10 Aug 2023 09:38:31 +0200 Subject: snappy: fix building with clang16 --- pkgs/development/libraries/snappy/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs/development/libraries/snappy') diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index a45d0a419e62e..004dd388385fd 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -23,16 +23,17 @@ stdenv.mkDerivation rec { url = "https://build.opensuse.org/public/source/openSUSE:Factory/snappy/reenable-rtti.patch?rev=a759aa6fba405cd40025e3f0ab89941d"; sha256 = "sha256-RMuM5yd6zP1eekN/+vfS54EyY4cFbGDVor1E1vj3134="; }) + # Fix -Wsign-compare warning on clang. + (fetchpatch { + url = "https://github.com/google/snappy/commit/27f34a580be4a3becf5f8c0cba13433f53c21337.patch"; + sha256 = "sha256-eq6ueeMAkd2bYmPJcKAZZzd5QlXyeWOrsxFIwR8KOpQ="; + }) ]; outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ]; - # See https://github.com/NixOS/nixpkgs/pull/219778#issuecomment-1464884412 - # and https://github.com/NixOS/nixpkgs/pull/221215#issuecomment-1482564003. - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-sign-compare"; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" "-DSNAPPY_BUILD_TESTS=OFF" -- cgit 1.4.1