gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #221215 from samuela/samuela/snappy

Browse Source 
snappy: 1.1.9 -> 1.1.10
This commit is contained in:
Martin Weinelt
2023-03-15 17:17:49 +00:00
committed by GitHub
parent 19680e9902 c3a42a047c
commit f2499cd5ec
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/snappy/default.nix
+5 -7
View File
@@ -5,21 +5,16 @@
stdenv.mkDerivation rec {
pname = "snappy";
version = "1.1.9";
version = "1.1.10";
src = fetchFromGitHub {
owner = "google";
repo = "snappy";
rev = version;
sha256 = "sha256-JXWl63KVP+CDNWIXYtz+EKqWLJbPKl3ifhr8dKAp/w8=";
hash = "sha256-wYZkKVDXKCugycx/ZYhjV0BjM/NrEM0R6A4WFhs/WPU=";
};
patches = [
(fetchpatch {
name = "clang-7-compat.patch";
url = "https://github.com/google/snappy/pull/142/commits/658cb2fcf67b626fff2122a3dbf7a3560c58f7ee.patch";
sha256 = "1kg3lxjwmhc7gjx36nylilnf444ddbnr3px1wpvyc6l1nh6zh4al";
})
# Re-enable RTTI, without which other applications can't subclass
# snappy::Source (this breaks Ceph, as one example)
# https://tracker.ceph.com/issues/53060
@@ -34,6 +29,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
# See https://github.com/NixOS/nixpkgs/pull/219778#issuecomment-1464884412.
env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isAarch64 && stdenv.isDarwin) "-Wno-sign-compare";
cmakeFlags = [
"-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}"
"-DSNAPPY_BUILD_TESTS=OFF"