diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-05-13 10:21:29 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-05-13 10:21:29 +0000 |
| commit | 6e1e2d5aba433751d0d46a55f90ffbff63871046 (patch) | |
| tree | 8f339c784678ba81fd256a1059d7c2dfd7ced873 | |
| parent | 6094c8436991972791734c337a8c11a8cc802ade (diff) | |
| download | nixlib-6e1e2d5aba433751d0d46a55f90ffbff63871046.tar nixlib-6e1e2d5aba433751d0d46a55f90ffbff63871046.tar.gz nixlib-6e1e2d5aba433751d0d46a55f90ffbff63871046.tar.bz2 nixlib-6e1e2d5aba433751d0d46a55f90ffbff63871046.tar.lz nixlib-6e1e2d5aba433751d0d46a55f90ffbff63871046.tar.xz nixlib-6e1e2d5aba433751d0d46a55f90ffbff63871046.tar.zst nixlib-6e1e2d5aba433751d0d46a55f90ffbff63871046.zip | |
Adding muparser and meshlab.
svn path=/nixpkgs/trunk/; revision=15585
| -rw-r--r-- | pkgs/applications/graphics/meshlab/default.nix | 38 | ||||
| -rw-r--r-- | pkgs/development/libraries/muparser/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
3 files changed, 56 insertions, 0 deletions
diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix new file mode 100644 index 000000000000..10b48b063256 --- /dev/null +++ b/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+"; + }; +} diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix new file mode 100644 index 000000000000..5ba196542d0f --- /dev/null +++ b/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"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1e1c954af67..1a956e9639f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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; |