JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #91692 from nh2/cloudcompare-qt-mkDerivation

Browse Source 
cloudcompare: Improve Qt wrapping
This commit is contained in:
Niklas Hambüchen 2020-06-28 00:38:06 +02:00 committed by GitHub
commit 4ddf28ebfb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/graphics/cloudcompare/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv
{ lib
, mkDerivation
, fetchFromGitHub
, cmake
, wrapQtAppsHook
, dxflib
, eigen
, flann
@ -16,7 +16,7 @@
, xercesc
}:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "cloudcompare";
version = "2.11.0";
@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
eigen # header-only
wrapQtAppsHook
];
buildInputs = [
@ -73,7 +72,7 @@ stdenv.mkDerivation rec {
"-DPLUGIN_IO_QRDB=OFF" # Riegl rdblib is proprietary; not packaged in nixpkgs
];
meta = with stdenv.lib; {
meta = with lib; {
description = "3D point cloud and mesh processing software";
homepage = "https://cloudcompare.org";
license = licenses.gpl2Plus;