From fc9b47c5d5d5700f52d4cfdb586b43fcde0cac00 Mon Sep 17 00:00:00 2001 From: Mike Purvis Date: Thu, 29 Dec 2022 14:06:20 +0000 Subject: [PATCH 1/2] openvdb: refactor for split outputs --- pkgs/development/libraries/openvdb/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index f2b95bd07e3c..db5cbca180dc 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -5,6 +5,8 @@ stdenv.mkDerivation rec pname = "openvdb"; version = "9.1.0"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "dreamworksanimation"; repo = "openvdb"; @@ -16,6 +18,14 @@ stdenv.mkDerivation rec buildInputs = [ openexr boost tbb jemalloc c-blosc ilmbase ]; + cmakeFlags = [ "-DOPENVDB_CORE_STATIC=OFF" ]; + + postFixup = '' + substituteInPlace $dev/lib/cmake/OpenVDB/FindOpenVDB.cmake \ + --replace \''${OPENVDB_LIBRARYDIR} $out/lib \ + --replace \''${OPENVDB_INCLUDEDIR} $dev/include + ''; + meta = with lib; { description = "An open framework for voxel"; homepage = "https://www.openvdb.org"; From 2598743628254f298ef2e770087affe6f47e6ad0 Mon Sep 17 00:00:00 2001 From: Mike Purvis Date: Tue, 3 Jan 2023 16:06:17 +0000 Subject: [PATCH 2/2] openvdb: 9.1.0 -> 10.0.1 --- pkgs/development/libraries/openvdb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index db5cbca180dc..214149edad94 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -3,15 +3,15 @@ stdenv.mkDerivation rec { pname = "openvdb"; - version = "9.1.0"; + version = "10.0.1"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { - owner = "dreamworksanimation"; + owner = "AcademySoftwareFoundation"; repo = "openvdb"; rev = "v${version}"; - sha256 = "sha256-OP1xCR1YW60125mhhrW5+8/4uk+EBGIeoWGEU9OiIGY="; + sha256 = "sha256-kaf5gpGYVWinmnRwR/IafE1SJcwmP2psfe/UZdtH1Og="; }; nativeBuildInputs = [ cmake ];