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

meshlab: use system vcg

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-04-17 02:29:52 +03:00
parent 7b08f65f57
commit 2a7a4ec079
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/graphics/meshlab/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, qt4, bzip2, lib3ds, levmar, muparser, unzip}: { stdenv, fetchurl, qt4, bzip2, lib3ds, levmar, muparser, unzip, vcg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "meshlab-1.3.3"; name = "meshlab-1.3.3";
@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
buildPhase = '' buildPhase = ''
mkdir -p "$out/include" mkdir -p "$out/include"
cp -r vcglib "$out/include"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$out/include/vcglib"
export NIX_LDFLAGS="-rpath $out/opt/meshlab $NIX_LDFLAGS" export NIX_LDFLAGS="-rpath $out/opt/meshlab $NIX_LDFLAGS"
cd meshlab/src cd meshlab/src
pushd external pushd external
@ -38,7 +36,7 @@ stdenv.mkDerivation rec {
sourceRoot = "."; sourceRoot = ".";
buildInputs = [ qt4 unzip ]; buildInputs = [ qt4 unzip vcg ];
meta = { meta = {
description = "System for the processing and editing of unstructured 3D triangular meshes"; description = "System for the processing and editing of unstructured 3D triangular meshes";