diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-17 02:29:52 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-20 18:55:41 +0300 |
| commit | 2a7a4ec079405c01b0e504aaacff1cdd52637789 (patch) | |
| tree | a51c21bd33d87e2501fe326060221ff9b14819d3 | |
| parent | 7b08f65f57296ba9c16aaa428bed86677f53cfd6 (diff) | |
| download | nixlib-2a7a4ec079405c01b0e504aaacff1cdd52637789.tar nixlib-2a7a4ec079405c01b0e504aaacff1cdd52637789.tar.gz nixlib-2a7a4ec079405c01b0e504aaacff1cdd52637789.tar.bz2 nixlib-2a7a4ec079405c01b0e504aaacff1cdd52637789.tar.lz nixlib-2a7a4ec079405c01b0e504aaacff1cdd52637789.tar.xz nixlib-2a7a4ec079405c01b0e504aaacff1cdd52637789.tar.zst nixlib-2a7a4ec079405c01b0e504aaacff1cdd52637789.zip | |
meshlab: use system vcg
| -rw-r--r-- | pkgs/applications/graphics/meshlab/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 49bfb47c85a4..d8434de5a77e 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qt4, bzip2, lib3ds, levmar, muparser, unzip}: +{ stdenv, fetchurl, qt4, bzip2, lib3ds, levmar, muparser, unzip, vcg }: stdenv.mkDerivation rec { name = "meshlab-1.3.3"; @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { buildPhase = '' 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" cd meshlab/src pushd external @@ -38,7 +36,7 @@ stdenv.mkDerivation rec { sourceRoot = "."; - buildInputs = [ qt4 unzip ]; + buildInputs = [ qt4 unzip vcg ]; meta = { description = "System for the processing and editing of unstructured 3D triangular meshes"; |