shark: fix build with boost187

NixOS · Feb 6, 2025 · cb5e7be · cb5e7be
1 parent 3210f68
commit cb5e7be
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/pkgs/by-name/li/libspatialite/package.nix b/pkgs/by-name/li/libspatialite/package.nix
@@ -56,13 +56,16 @@ stdenv.mkDerivation (finalAttrs: {
       libxml2
       minizip
       proj
-      sqlite
       zlib
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       libiconv
     ];
 
+  propagatedBuildInputs = [
+    sqlite
+  ];
+
   enableParallelBuilding = true;
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''

diff --git a/pkgs/by-name/sh/shark/package.nix b/pkgs/by-name/sh/shark/package.nix
@@ -23,6 +23,11 @@ stdenv.mkDerivation (finalAttrs: {
   # c.f https://github.com/Shark-ML/Shark/commit/221c1f2e8abfffadbf3c5ef7cf324bc6dc9b4315
   patches = [ ./shark-2-ext-num-literals-all.diff ];
 
+  # Remove explicitly setting C++11, because boost::math headers need C++14 since Boost187.
+  postPatch = ''
+    sed -i '/CXX_STANDARD/d' src/CMakeLists.txt
+  '';
+
   # https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/blob/develop/SuperBuild/CMake/External_shark.cmake?ref_type=heads
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS=ON"

diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "protobuf";
   inherit version;
 
+  outputs = ["out" "dev"];
+
   src = fetchFromGitHub {
     owner = "protocolbuffers";
     repo = "protobuf";