pyrox.dev
snappy: 1.2.1 -> 1.2.2 (take 2)
This time we revert interface changes to not break
`arrow-cpp` and others.
Changes: https://github.com/google/snappy/releases/tag/1.2.2
+3
-11
pkgs/by-name/sn/snappy/package.nix
+3
-11
pkgs/by-name/sn/snappy/package.nix
···
3
3
stdenv,
4
4
fetchFromGitHub,
5
5
cmake,
6
-
fetchpatch,
7
6
static ? stdenv.hostPlatform.isStatic,
8
7
}:
9
8
10
9
stdenv.mkDerivation rec {
11
10
pname = "snappy";
12
-
version = "1.2.1";
11
+
version = "1.2.2";
13
12
14
13
src = fetchFromGitHub {
15
14
owner = "google";
16
15
repo = "snappy";
17
16
rev = version;
18
-
hash = "sha256-IzKzrMDjh+Weor+OrKdX62cAKYTdDXgldxCgNE2/8vk=";
17
+
hash = "sha256-bMZD8EI9dvDGupfos4hi/0ShBkrJlI5Np9FxE6FfrNE=";
19
18
};
20
19
21
20
patches = [
22
-
# Re-enable RTTI, without which other applications can't subclass
23
-
# snappy::Source (this breaks Ceph, as one example)
24
-
# https://tracker.ceph.com/issues/53060
25
-
# https://build.opensuse.org/package/show/openSUSE:Factory/snappy
26
-
(fetchpatch {
27
-
url = "https://build.opensuse.org/public/source/openSUSE:Factory/snappy/reenable-rtti.patch?rev=a759aa6fba405cd40025e3f0ab89941d";
28
-
sha256 = "sha256-RMuM5yd6zP1eekN/+vfS54EyY4cFbGDVor1E1vj3134=";
29
-
})
21
+
./revert-PUBLIC.patch
30
22
];
31
23
32
24
outputs = [
+11
pkgs/by-name/sn/snappy/revert-PUBLIC.patch
+11
pkgs/by-name/sn/snappy/revert-PUBLIC.patch
···
1
+
https://github.com/google/snappy/issues/206
2
+
--- a/CMakeLists.txt
3
+
+++ b/CMakeLists.txt
4
+
@@ -261,7 +261,6 @@ target_sources(snappy
5
+
"snappy-stubs-internal.cc"
6
+
"snappy.cc"
7
+
"${PROJECT_BINARY_DIR}/config.h"
8
+
- PUBLIC
9
+
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/snappy-c.h>
10
+
$<INSTALL_INTERFACE:include/snappy-c.h>
11
+
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/snappy-sinksource.h>