diff options
author | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-08-23 23:41:27 +0200 |
---|---|---|
committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2018-08-23 23:41:27 +0200 |
commit | 551fec44673ea023c303335e762f880d3c28646e (patch) | |
tree | 4d726dc291badc45899c225e36f5315ef7f938ee /pkgs/applications/graphics/meshlab/default.nix | |
parent | 3f889f30bee92c3f2d5eaf53e56aef68f61efc4a (diff) | |
parent | 291de70ed6b736285ae4de6e3e556c0fc86c2348 (diff) | |
download | nixlib-551fec44673ea023c303335e762f880d3c28646e.tar nixlib-551fec44673ea023c303335e762f880d3c28646e.tar.gz nixlib-551fec44673ea023c303335e762f880d3c28646e.tar.bz2 nixlib-551fec44673ea023c303335e762f880d3c28646e.tar.lz nixlib-551fec44673ea023c303335e762f880d3c28646e.tar.xz nixlib-551fec44673ea023c303335e762f880d3c28646e.tar.zst nixlib-551fec44673ea023c303335e762f880d3c28646e.zip |
Merge branch 'master' into es6
Diffstat (limited to 'pkgs/applications/graphics/meshlab/default.nix')
-rw-r--r-- | pkgs/applications/graphics/meshlab/default.nix | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index eaaabe8fd395..bd5dea8014d6 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -1,10 +1,13 @@ -{ stdenv, fetchFromGitHub, libGLU, qtbase, qtscript, qtxmlpatterns }: +{ fetchFromGitHub, libGLU, llvmPackages, qtbase, qtscript, qtxmlpatterns }: let - meshlabRev = "5700f5474c8f90696a8925e2a209a0a8ab506662"; - vcglibRev = "a8e87662b63ee9f4ded5d4699b28d74183040803"; + meshlabRev = "d596d7c086c51fbdfb56050f9c30b55dd0286d4c"; + vcglibRev = "6c3c940e34327322507c703889f9f1cfa73ab183"; + # ^ this should be the latest commit in the vcglib devel branch at the time of the meshlab revision + + stdenv = llvmPackages.stdenv; # only building with clang seems to be tested upstream in stdenv.mkDerivation { - name = "meshlab-2016.12"; + name = "meshlab-20180627-beta"; srcs = [ @@ -12,31 +15,32 @@ in stdenv.mkDerivation { owner = "cnr-isti-vclab"; repo = "meshlab"; rev = meshlabRev; - sha256 = "0srrp7zhi86dsg4zsx1615gr26barz38zdl8s03zq6vm1dgzl3cc"; + sha256 = "0xi7wiyy0yi545l5qvccbqahlcsf70mhx829gf7bq29640si4rax"; name = "meshlab-${meshlabRev}"; }) (fetchFromGitHub { owner = "cnr-isti-vclab"; repo = "vcglib"; rev = vcglibRev; - sha256 = "0jh8jc8rn7rci8qr3q03q574fk2hsc3rllysck41j8xkr3rmxz2f"; + sha256 = "0jfgjvf21y9ncmyr7caipy3ardhig7hh9z8miy885c99b925hhwd"; name = "vcglib-${vcglibRev}"; }) ]; sourceRoot = "meshlab-${meshlabRev}"; - patches = [ ./fix-2016.02.patch ]; - hardeningDisable = [ "format" ]; enableParallelBuilding = true; + patches = [ ./fix-20180627-beta.patch ]; + buildPhase = '' # MeshLab has ../vcglib hardcoded everywhere, so move the source dir mv ../vcglib-${vcglibRev} ../vcglib cd src export NIX_LDFLAGS="-rpath $out/opt/meshlab $NIX_LDFLAGS" + export QMAKESPEC="linux-clang" pushd external qmake -recursive external.pro @@ -53,7 +57,7 @@ in stdenv.mkDerivation { ln -s $out/opt/meshlab/meshlabserver $out/bin/meshlabserver ''; - buildInputs = [ libGLU qtbase qtscript qtxmlpatterns ]; + buildInputs = [ libGLU llvmPackages.openmp qtbase qtscript qtxmlpatterns ]; meta = { description = "A system for processing and editing 3D triangular meshes."; @@ -61,6 +65,5 @@ in stdenv.mkDerivation { license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; - broken = true; # 2018-04-11 }; } |