From f3de64943da6e67f6d00e36a0a97f057065c2fb6 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 6 Nov 2021 15:29:49 -0700 Subject: [PATCH] snappy: fix build on x86_64-darwin Needs patch for compatibility with clang 7 --- pkgs/development/libraries/snappy/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index f2b83136cb23..71209295b9fd 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake +, fetchpatch , static ? stdenv.hostPlatform.isStatic }: @@ -13,6 +14,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-JXWl63KVP+CDNWIXYtz+EKqWLJbPKl3ifhr8dKAp/w8="; }; + patches = [ + (fetchpatch { + name = "clang-7-compat.patch"; + url = "https://github.com/google/snappy/pull/142/commits/658cb2fcf67b626fff2122a3dbf7a3560c58f7ee.patch"; + sha256 = "1kg3lxjwmhc7gjx36nylilnf444ddbnr3px1wpvyc6l1nh6zh4al"; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ];