From 1616afc2128d0ba4f6f21b4a634f52ed8329a3b8 Mon Sep 17 00:00:00 2001
From: Tyson Whitehead <twhitehead@gmail.com>
Date: Thu, 28 Jan 2021 17:10:44 -0500
Subject: [PATCH] cloudcompare: Upstream now

---
 pkgs/all-packages.nix |  2 --
 pkgs/cloudcompare.nix | 42 ------------------------------------------
 2 files changed, 44 deletions(-)
 delete mode 100644 pkgs/cloudcompare.nix

diff --git a/pkgs/all-packages.nix b/pkgs/all-packages.nix
index 1ddb702..28040a6 100644
--- a/pkgs/all-packages.nix
+++ b/pkgs/all-packages.nix
@@ -4,8 +4,6 @@
 #
 self: super: pkgs: with pkgs; {
 
-  cloudcompare = libsForQt5.callPackage ./cloudcompare.nix { boost = boost15x; };
-
   fastqc = callPackage ./fastqc.nix { };
 
   #firedrake = callPackage ./firedrake { };
diff --git a/pkgs/cloudcompare.nix b/pkgs/cloudcompare.nix
deleted file mode 100644
index 1ea696c..0000000
--- a/pkgs/cloudcompare.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake
-, boost, eigen, dxflib, gdal, flann, libLAS, LASzip
-, qtbase }:
-
-stdenv.mkDerivation rec {
-  version = "2.9.1";
-  name = "CloudCompare-${version}";
-
-  src = fetchFromGitHub {
-    owner = "CloudCompare";
-    repo = "CloudCompare";
-    rev = "v${version}";
-    sha256 = "1qlylr7l8bnji3v4imj2rssy23gqhxrrig950if5myh6yjk63prs";
-  };
-
-  buildInputs = [
-    cmake
-    boost
-    eigen
-    dxflib
-    gdal
-    flann
-    libLAS
-    LASzip
-    qtbase
-  ];
-
-  cmakeFlags = [
-    "-DOPTION_USE_DXF_LIB=ON"
-    "-DOPTION_USE_GDAL=ON"
-    "-DOPTION_USE_LIBLAS=ON"
-    "-DLIBLAS_INCLUDE_DIR=${libLAS}/include/liblas"
-    "-DLIBLAS_RELEASE_LIBRARY_FILE=${libLAS}/lib/liblas.so"
-    "-DOPTION_USE_SHAPE_LIB=ON"
-  ];
-
-  meta = with stdenv.lib; {
-    description = "3D point cloud and mesh processing software";
-    homepage = https://www.danielgm.net/cc;
-    license = licenses.gpl2Plus;
-  };
-}