pdal: 2.1.0 -> 2.2.0

1 files changed, 4 insertions, 21 deletions

diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/development/libraries/pdal/default.nix
index 4fbf5df07746e..4405d3812b76d 100644
--- a/pkgs/development/libraries/pdal/default.nix
+++ b/pkgs/development/libraries/pdal/default.nix
@@ -3,7 +3,7 @@
 , fetchpatch
 , cmake
 , pkg-config
-# , openscenegraph
+, openscenegraph
 , curl
 , gdal
 , hdf5-cpp
@@ -20,34 +20,22 @@
 
 stdenv.mkDerivation rec {
   pname = "pdal";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "PDAL";
     repo = "PDAL";
     rev = version;
-    sha256 = "0zb3zjqgmjjryb648c1hmwh1nfa7893bjzbqpmr6shjxvzgnj9p6";
+    sha256 = "1i7nbfvv60jjlf3iq7a7xci4dycmg2wrd35dqvjwl6hpfynpb6wz";
   };
 
-  patches = [
-    # Fix duplicate paths like
-    #     /nix/store/7iafqfmjdlxqim922618wg87cclrpznr-PDAL-2.1.0//nix/store/7iafqfmjdlxqim922618wg87cclrpznr-PDAL-2.1.0/lib
-    # similar to https://github.com/NixOS/nixpkgs/pull/82654.
-    # TODO Remove on release > 2.1.0
-    (fetchpatch {
-      name = "pdal-Fixup-install-config.patch";
-      url = "https://github.com/PDAL/PDAL/commit/2f887ef624db50c6e20f091f34bb5d3e65b5c5c8.patch";
-      sha256 = "0pdw9v5ypq7w9i7qzgal110hjb9nqi386jvy3x2h4vf1dyalzid8";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
   ];
 
   buildInputs = [
-    # openscenegraph
+    openscenegraph
     curl
     gdal
     hdf5-cpp
@@ -68,11 +56,6 @@ stdenv.mkDerivation rec {
     "-DBUILD_PLUGIN_PGPOINTCLOUD=ON"
     "-DBUILD_PLUGIN_TILEDB=ON"
 
-    # Plugins that can probably be made working relatively easily:
-    # As of writing, seems to be incompatible (build error):
-    #     error: no matching function for call to 'osg::TriangleFunctor<pdal::CollectTriangles>::operator()(const Vec3&, const Vec3&, const Vec3&)'
-    "-DBUILD_PLUGIN_OPENSCENEGRAPH=OFF" # requires OpenGL
-
     # Plugins can probably not be made work easily:
     "-DBUILD_PLUGIN_CPD=OFF"
     "-DBUILD_PLUGIN_FBX=OFF" # Autodesk FBX SDK is gratis+proprietary; not packaged in nixpkgs