From dbf41bb61478283a3e1adc2f2d87d54723af445f Mon Sep 17 00:00:00 2001 From: evils <30512529+evils@users.noreply.github.com> Date: Thu, 7 Jul 2022 15:03:23 +0200 Subject: [PATCH] openvdb: 7.0.0 -> 9.1.0 (#180144) --- .../development/libraries/openvdb/default.nix | 34 +++---------------- 1 file changed, 5 insertions(+), 29 deletions(-) diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index 655d664d8fa6..f2b95bd07e3c 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -1,50 +1,26 @@ -{ lib, stdenv, fetchFromGitHub, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }: +{ lib, stdenv, fetchFromGitHub, cmake, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }: stdenv.mkDerivation rec { pname = "openvdb"; - version = "7.0.0"; + version = "9.1.0"; src = fetchFromGitHub { owner = "dreamworksanimation"; repo = "openvdb"; rev = "v${version}"; - sha256 = "0hhs50f05hkgj1wni53cwbsx2bhn1aam6z65j133356gbid2carl"; + sha256 = "sha256-OP1xCR1YW60125mhhrW5+8/4uk+EBGIeoWGEU9OiIGY="; }; - outputs = [ "out" ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ openexr boost tbb jemalloc c-blosc ilmbase ]; - setSourceRoot = '' - sourceRoot=$(echo */openvdb) - ''; - - installTargets = [ "install_lib" ]; - - enableParallelBuilding = true; - - buildFlags = [ - "lib" - "DESTDIR=$(out)" - "HALF_LIB=-lHalf" - "TBB_LIB=-ltbb" - "BLOSC_LIB=-lblosc" - "LOG4CPLUS_LIB=" - "BLOSC_INCLUDE_DIR=${c-blosc}/include/" - "BLOSC_LIB_DIR=${c-blosc}/lib/" - ]; - - installFlags = [ "DESTDIR=$(out)" ]; - - NIX_CFLAGS_COMPILE="-I${openexr.dev}/include/OpenEXR -I${ilmbase.dev}/include/OpenEXR/"; - NIX_LDFLAGS="-lboost_iostreams"; - meta = with lib; { description = "An open framework for voxel"; homepage = "https://www.openvdb.org"; maintainers = [ maintainers.guibou ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.mpl20; }; }