From a3e4c7640f18ac4bc07feafc09a0c687c34b1554 Mon Sep 17 00:00:00 2001 From: LluĂ­s Batlle i Rossell Date: Thu, 21 Jan 2010 14:39:53 +0000 Subject: Updating meshlab. Their build system has changed, and the source tree they distribute too, so the dependencies changed a bit. To get meshlab working, I update lib3ds and add levmar. svn path=/nixpkgs/trunk/; revision=19595 --- pkgs/applications/graphics/meshlab/default.nix | 29 +++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) (limited to 'pkgs/applications/graphics/meshlab/default.nix') diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 1a1fa1605c55..bc816a1daf75 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, qt, bzip2}: +{stdenv, fetchurl, qt, bzip2, lib3ds, levmar, muparser, unzip}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "meshlab-1.2.2"; src = fetchurl { @@ -8,14 +8,29 @@ stdenv.mkDerivation { sha256 = "166a8mx72wf3r84pnpr0ssqkd2xw6y5brviywlj8rjk6w9cy8fdc"; }; + srcGlew151 = fetchurl { + url = http://dfn.dl.sourceforge.net/sourceforge/glew/glew-1.5.1-src.tgz; + sha256 = "02n1p6s6sia92fgng9iq0kqq890rga8d8g0y34mc6qxmbh43vrl9"; + }; + + srcQHull20031 = fetchurl { + url = http://www.qhull.org/download/qhull-2003.1.zip; + sha256 = "07mh371i6xs691qz6wwzkqk9h0d2dkih2q818is2b041w1l79b46"; + }; - setSourceRoot = "sourceRoot=`pwd`/meshlab/src"; - buildPhase = '' + patchPhase = '' + cd meshlab/src + mkdir external pushd external - qmake -recursive external.pro - make + tar xf ${srcGlew151} + mv glew glew-1.5.1 + unzip ${srcQHull20031} popd + ''; + + buildPhase = '' + pwd qmake -recursive meshlabv12.pro make ''; @@ -28,7 +43,7 @@ stdenv.mkDerivation { ln -s $out/opt/meshlab/meshlab $out/bin/meshlab ''; - buildInputs = [ qt bzip2 ]; + buildInputs = [ qt bzip2 lib3ds levmar muparser unzip ]; meta = { description = "System for the processing and editing of unstructured 3D triangular meshes"; -- cgit 1.4.1