public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17246 from DamienCassou/vtk-7.0.0 

vtk: 5.10.1 -> 7.0.0
This commit is contained in:
Damien Cassou 2016-08-12 10:02:27 +02:00 committed by GitHub
parent 4b20c5367d 8e3120bb7e
commit a00a2466b6
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/gdcm/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, cmake, vtk }: { stdenv, fetchurl, cmake, vtk }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.4.6"; version = "2.6.4";
name = "gdcm-${version}"; name = "gdcm-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/gdcm/${name}.tar.bz2"; url = "mirror://sourceforge/gdcm/${name}.tar.bz2";
sha256 = "0rgqgkjyqgld0hpa311z8cddp42v9ihzidyanwyxqpv3jmcrlsfk"; sha256 = "14bysjdldq7xb9k1ayskxijm08dy2n45v9bg379dqrcz1q5xq5mi";
}; };
dontUseCmakeBuildDir = true; dontUseCmakeBuildDir = true;

13
pkgs/development/libraries/pcl/default.nix
View File

@ -1,14 +1,15 @@
{ stdenv, fetchzip, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4 { stdenv, fetchFromGitHub, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4
, libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private , libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pcl-1.7.2"; name = "pcl-1.8.0";
src = fetchzip { src = fetchFromGitHub {
name = name + "-src"; owner = "PointCloudLibrary";
url = "https://github.com/PointCloudLibrary/pcl/archive/${name}.tar.gz"; repo = "pcl";
sha256 = "0sm19p6wcls2d9l0vi5fgwqp7l372nh3g7bdin42w31zr8dmz8h8"; rev = name;
sha256 = "1pki4y7mc2dryxc8wa7rs4hg74qab80rpy90jnw3j8fzf09kxcll";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

15
pkgs/development/libraries/vtk/default.nix
View File

@ -5,24 +5,25 @@ with stdenv.lib;
let let
os = stdenv.lib.optionalString; os = stdenv.lib.optionalString;
majorVersion = "5.10"; majorVersion = "7.0";
minorVersion = "1"; minorVersion = "0";
version = "${majorVersion}.${minorVersion}"; version = "${majorVersion}.${minorVersion}";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "vtk-${os (qtLib != null) "qvtk-"}${version}"; name = "vtk-${os (qtLib != null) "qvtk-"}${version}";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}files/release/${majorVersion}/vtk-${version}.tar.gz"; url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz";
sha256 = "1fxxgsa7967gdphkl07lbfr6dcbq9a72z5kynlklxn7hyp0l18pi"; sha256 = "1hrjxkcvs3ap0bdhk90vymz5pgvxmg7q6sz8ab3wsyddbshr1abq";
}; };
# https://bugzilla.redhat.com/show_bug.cgi?id=1138466
postPatch = "sed '/^#define GL_GLEXT_LEGACY/d' -i ./Rendering/vtkOpenGL.h";
buildInputs = [ cmake mesa libX11 xproto libXt ] buildInputs = [ cmake mesa libX11 xproto libXt ]
++ optional (qtLib != null) qtLib; ++ optional (qtLib != null) qtLib;
preBuild = ''
export LD_LIBRARY_PATH="$(pwd)/lib";
'';
# Shared libraries don't work, because of rpath troubles with the current # Shared libraries don't work, because of rpath troubles with the current
# nixpkgs camke approach. It wants to call a binary at build time, just # nixpkgs camke approach. It wants to call a binary at build time, just
# built and requiring one of the shared objects. # built and requiring one of the shared objects.