From 96776d5a2fbda19d00777d7791d69340ef0a69c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sat, 27 Jun 2020 23:50:36 +0200 Subject: [PATCH] cloudcompare: Improve Qt wrapping. As I learned in the review of #91627. --- pkgs/applications/graphics/cloudcompare/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix index 84844191235..209a6a4753b 100644 --- a/pkgs/applications/graphics/cloudcompare/default.nix +++ b/pkgs/applications/graphics/cloudcompare/default.nix @@ -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;