LAStools: 180812 -> 201003

pkgs/development/libraries/LAStools/default.nix

@@ -1,23 +1,33 @@
-{ stdenv, fetchFromGitHub, cmake, fetchurl}:
+{ stdenv, fetchFromGitHub, cmake }:
-stdenv.mkDerivation rec {
 
-  version = "180812";
+stdenv.mkDerivation rec {
-  name = "LAStools-${version}";
+  pname = "LAStools";
+  version = "201003"; # LAStools makes release-ish commits with a message containing their version number as YYMMDD; these align with their website changelog
 
   src = fetchFromGitHub {
     owner = "LAStools";
     repo = "LAStools";
-    rev = "162cf032f25cac492712a8568a08b224a5fb40c2";
+    rev = "635b76b42cc4912762da31b92f875df5310e1714";
-    sha256 = "117c9csbfwsx424ha695l7d99cswi316k8q338mzk1lxlk8p3xbz";
+    sha256 = "0682ca3bp51lmfp46vsjnd1bqpn05g95pf4kclvjv1y8qivkxsaq";
   };
 
-  nativeBuildInputs = [cmake];
+  patches = [
+    ./drop-64-suffix.patch # necessary to prevent '64' from being appended to the names of the executables
+  ];
 
-  meta = {
+  hardeningDisable = [
-    description = "Efficient tools for LiDAR processing.";
+    "format"
-    homepage = https://www.laszip.org;
+  ];
-    license = stdenv.lib.licenses.lgpl2;
+
-    maintainers = [ stdenv.lib.maintainers.mpickering ];
+  nativeBuildInputs = [
-    platforms = stdenv.lib.platforms.unix;
+    cmake
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Software for rapid LiDAR processing";
+    homepage = http://lastools.org/;
+    license = licenses.unfree;
+    maintainers = with maintainers; [ stephenwithph ];
+    platforms = platforms.unix;
   };
 }

pkgs/development/libraries/LAStools/drop-64-suffix.patch

@@ -0,0 +1,13 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -32,6 +32,6 @@ endforeach(TARGET)
+ foreach(TARGET ${ALL_TARGETS})
+ 	target_link_libraries(${TARGET} LASlib)
+ 	set_target_properties(${TARGET} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../bin64)
+-	set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME ${TARGET}64)
++	set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME ${TARGET})
+ 	install(TARGETS ${TARGET} RUNTIME DESTINATION bin)
+ endforeach(TARGET)
+-- 
+2.28.0
+