Adding muparser and meshlab.

svn path=/nixpkgs/trunk/; revision=15585

pkgs/applications/graphics/meshlab/default.nix

@@ -0,0 +1,38 @@
+{stdenv, fetchurl, qt, bzip2}:
+
+stdenv.mkDerivation {
+  name = "meshlab-1.2.0";
+
+  src = fetchurl {
+    url = mirror://sourceforge/meshlab/MeshLabSrc_v120.tgz;
+    sha256 = "0iidp2pzwq96v8zbm8gc67wi1f41anpkncp17ajkv1rrh653nila";
+  };
+
+
+  setSourceRoot = "sourceRoot=`pwd`/meshlab/src";
+
+  buildPhase = ''
+    pushd external
+    qmake -recursive external.pro
+    make
+    popd
+    qmake -recursive meshlabv12.pro
+    make
+  '';
+
+  installPhase = ''
+    ensureDir $out/opt/meshlab $out/bin
+    pushd meshlab
+    cp -R meshlab plugins shaders* textures images $out/opt/meshlab
+    popd
+    ln -s $out/opt/meshlab/meshlab $out/bin/meshlab
+  '';
+
+  buildInputs = [ qt bzip2 ];
+
+  meta = {
+    description = "System for the processing and editing of unstructured 3D triangular meshes";
+    homepage = http://meshlab.sourceforge.net/;
+    license = "GPLv2+";
+  };
+}

pkgs/development/libraries/muparser/default.nix

@@ -0,0 +1,9 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+	name = "muparser-1.30";
+	src = fetchurl {
+		url = mirror://sourceforge/muparser/muparser_v130.tar.gz;
+		sha256 = "164wak2sva6z9vq3anrciz1npyk2x3wqkz6xwp9ld3gmdqbdn8s4";
+	};
+}

pkgs/top-level/all-packages.nix

@@ -3711,6 +3711,10 @@ let
     inherit fetchurl stdenv python;
   };
 
+  muparser = import ../development/libraries/muparser {
+    inherit fetchurl stdenv;
+  };
+
   ncurses = composedArgsAndFun (import ../development/libraries/ncurses) {
     inherit fetchurl stdenv;
     unicode = (system != "i686-cygwin");
@@ -6435,6 +6439,11 @@ let
     guiSupport = getConfig ["mercurial" "guiSupport"] false; # for hgk (gitk gui for hg)
   };
 
+  meshlab = import ../applications/graphics/meshlab {
+    inherit fetchurl stdenv bzip2;
+    qt = qt4;
+  };
+
   midori = builderDefsPackage (import ../applications/networking/browsers/midori) {
     inherit imagemagick intltool python pkgconfig webkit libxml2
       which gettext makeWrapper file;