Merge pull request #1062

Fix the static build
tenzir · Sep 17, 2020 · bbfc43e · bbfc43e
2 parents 54699c5 + 73fcb69
commit bbfc43e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/libvast/CMakeLists.txt b/libvast/CMakeLists.txt
@@ -240,7 +240,7 @@ if (VAST_USE_OPENSSL)
   target_link_libraries(libvast PUBLIC caf::openssl)
 endif ()
 
-target_link_libraries(libvast PUBLIC yaml-cpp)
+target_link_libraries(libvast PRIVATE yaml-cpp)
 
 target_link_libraries(libvast PUBLIC ${flatbuffers_target})
 add_dependencies(libvast libvast_flatbuffers)

diff --git a/nix/vast/default.nix b/nix/vast/default.nix
@@ -12,6 +12,7 @@
 , libpcap
 , arrow-cpp
 , flatbuffers
+, libyamlcpp
 , broker
 , jemalloc
 , python3
@@ -64,7 +65,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake cmake-format ];
   propagatedNativeBuildInputs = [ pkgconfig pandoc ];
-  buildInputs = [ libpcap flatbuffers jemalloc broker ];
+  buildInputs = [ libpcap flatbuffers jemalloc broker libyamlcpp ];
   propagatedBuildInputs = [ arrow-cpp caf ];
 
   cmakeFlags = [
@@ -75,8 +76,6 @@ stdenv.mkDerivation rec {
     "-DVAST_VERSION_TAG=${version}"
     "-DVAST_USE_JEMALLOC=ON"
     "-DBROKER_ROOT_DIR=${broker}"
-    # gen-table-slices runs at build time
-    "-DCMAKE_SKIP_BUILD_RPATH=OFF"
   ] ++ lib.optionals static [
     "-DVAST_STATIC_EXECUTABLE:BOOL=ON"
     "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION:BOOL=ON"