Skip to content

Commit febcb66

Browse files
committedDec 20, 2017
snappy: build shared library
See f689a6d Closes #32880
1 parent 3445138 commit febcb66

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed
 

‎pkgs/development/libraries/snappy/default.nix

+6-7
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,17 @@ stdenv.mkDerivation rec {
1111
sha256 = "1x7r8sjmdqlqjz0xfiwdyrqpgaj5yrvrgb28ivgpvnxgar5qv6m2";
1212
};
1313

14+
patches = [ ./disable-benchmark.patch ];
15+
1416
outputs = [ "out" "dev" ];
1517

1618
nativeBuildInputs = [ cmake ];
1719

18-
# -DNDEBUG for speed
19-
configureFlags = [ "CXXFLAGS=-DNDEBUG" ];
20+
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];
Has conversations. Original line has conversations.
21+
22+
checkTarget = "test";
2023

21-
# SIGILL on darwin
22-
doCheck = !stdenv.isDarwin;
23-
checkPhase = ''
24-
(cd .. && ./build/snappy_unittest)
25-
'';
24+
doCheck = true;
2625

2726
meta = with stdenv.lib; {
2827
homepage = https://google.github.io/snappy/;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
--- a/snappy-test.cc
Has conversations. Original line has conversations.
2+
+++ b/snappy-test.cc
3+
@@ -46 +46 @@
4+
-DEFINE_bool(run_microbenchmarks, true,
5+
+DEFINE_bool(run_microbenchmarks, false,

0 commit comments

Comments
 (0)
Please sign in to comment.