diff options
| author | Damien Cassou <damien@cassou.me> | 2016-07-25 10:42:13 +0200 |
|---|---|---|
| committer | Damien Cassou <damien@cassou.me> | 2016-08-02 19:57:40 +0200 |
| commit | d8e0ce402ea8238e47e10642ea3ce8b6a47ec058 (patch) | |
| tree | 23fbca607a9bc4bf292b89654d4442fe11e5e6d6 /pkgs | |
| parent | dbd856d7240b992fc45aedf6e2227f4028b72a5b (diff) | |
| download | nixpkgs-d8e0ce402ea8238e47e10642ea3ce8b6a47ec058.tar nixpkgs-d8e0ce402ea8238e47e10642ea3ce8b6a47ec058.tar.gz nixpkgs-d8e0ce402ea8238e47e10642ea3ce8b6a47ec058.tar.bz2 nixpkgs-d8e0ce402ea8238e47e10642ea3ce8b6a47ec058.tar.lz nixpkgs-d8e0ce402ea8238e47e10642ea3ce8b6a47ec058.tar.xz nixpkgs-d8e0ce402ea8238e47e10642ea3ce8b6a47ec058.tar.zst nixpkgs-d8e0ce402ea8238e47e10642ea3ce8b6a47ec058.zip | |
vtk: 5.10.1 -> 7.0.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/vtk/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 59063645232..20e2213e3e7 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -5,24 +5,25 @@ with stdenv.lib; let os = stdenv.lib.optionalString; - majorVersion = "5.10"; - minorVersion = "1"; + majorVersion = "7.0"; + minorVersion = "0"; version = "${majorVersion}.${minorVersion}"; in stdenv.mkDerivation rec { name = "vtk-${os (qtLib != null) "qvtk-"}${version}"; src = fetchurl { - url = "${meta.homepage}files/release/${majorVersion}/vtk-${version}.tar.gz"; - sha256 = "1fxxgsa7967gdphkl07lbfr6dcbq9a72z5kynlklxn7hyp0l18pi"; + url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz"; + 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 ] ++ optional (qtLib != null) qtLib; + preBuild = '' + export LD_LIBRARY_PATH="$(pwd)/lib"; + ''; + # 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 # built and requiring one of the shared objects. |