Unverified Commit b423275c authored by a-n-n-a-l-e-e's avatar a-n-n-a-l-e-e Committed by GitHub
Browse files

Merge pull request #291243 from simonhollingshead/s2geometry-cpp14 

s2geometry: Build with C++14 instead of C++11.
parents acbfd74c b7230e67

pkgs/development/libraries/s2geometry/default.nix

+6 −0
Original line number Diff line number Diff line
@@ -22,6 +22,12 @@ stdenv.mkDerivation rec { 
  nativeBuildInputs = [ cmake pkg-config ];

  buildInputs = [ openssl gtest ];



  # Default of C++11 is too low for gtest.

  # In newer versions of s2geometry this can be done with cmakeFlags.

  postPatch = ''

    substituteInPlace CMakeLists.txt --replace "CMAKE_CXX_STANDARD 11" "CMAKE_CXX_STANDARD 14"

  '';



  meta = with lib; {

    description = "Computational geometry and spatial indexing on the sphere";

    homepage = "http://s2geometry.io/";