Unverified Commit ce6243d1 authored by Stanisław Pitucha's avatar Stanisław Pitucha Committed by GitHub
Browse files

shark: fix after boost upgrade (#502060)

parents 2cefb802 915c4836

pkgs/by-name/sh/shark/boost-1.89.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff --git a/CMakeLists.txt b/CMakeLists.txt

index 830f0baf..a9048f14 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -147,7 +147,7 @@ endif()

 find_package( 

 	Boost 1.48.0 REQUIRED COMPONENTS

 	serialization

-	filesystem system

+	filesystem

 )

 

 if(NOT Boost_FOUND)

pkgs/by-name/sh/shark/package.nix

+4 −1
Original line number Diff line number Diff line
@@ -21,7 +21,10 @@ stdenv.mkDerivation (finalAttrs: { 
  # https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/tree/develop/SuperBuild/patches/SHARK?ref_type=heads

  # patch of hdf5 seems to be not needed based on latest master branch of shark as HDF5 has been removed

  # c.f https://github.com/Shark-ML/Shark/commit/221c1f2e8abfffadbf3c5ef7cf324bc6dc9b4315

  patches = [ ./shark-2-ext-num-literals-all.diff ];

  patches = [

    ./shark-2-ext-num-literals-all.diff

    ./boost-1.89.patch

  ];



  # Remove explicitly setting C++11, because boost::math headers need C++14 since Boost187.

  postPatch = ''