From b1460e25c5f967fe886849d560b11d406b8f0dcc Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 22 Sep 2023 16:01:09 -0400 Subject: [PATCH 1/2] openpgl: init at 0.5.0 Setting TBB_ROOT to the out path is necessary as otherwise the bundled FindTBB.cmake tries to search the `tbb.dev` output for the library files. Note that embree and nanoflann are bundled within the source. The build system is not currently setup to use non-vendored libs. Rebuilt 25 times to test reproducibility. Attempted a build on x86_64-darwin, and it failed, so marking this as linux only. --- pkgs/by-name/op/openpgl/package.nix | 41 +++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 pkgs/by-name/op/openpgl/package.nix diff --git a/pkgs/by-name/op/openpgl/package.nix b/pkgs/by-name/op/openpgl/package.nix new file mode 100644 index 000000000000..6c94e9edfe50 --- /dev/null +++ b/pkgs/by-name/op/openpgl/package.nix @@ -0,0 +1,41 @@ +{ lib +, cmake +, fetchFromGitHub +, ninja +, stdenv +, tbb +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "openpgl"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "OpenPathGuidingLibrary"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + hash = "sha256-dbHmGGiHQkU0KPpQYpY/o0uCWdb3L5namETdOcOREgs="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + tbb + ]; + + cmakeFlags = [ + "-DOPENPGL_BUILD_STATIC=OFF" + "-DTBB_ROOT=${tbb.out}" + ]; + + meta = { + description = "Intel Open Path Guiding Library"; + homepage = "https://github.com/OpenPathGuidingLibrary/openpgl"; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.amarshall ]; + license = lib.licenses.asl20; + }; +}) From 0c4a07bf9f3cc6438c0c5e00dd6d6055bd65e0bf Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 22 Sep 2023 16:02:26 -0400 Subject: [PATCH 2/2] blender: enable path guiding support https://wiki.blender.org/wiki/Reference/Release_Notes/3.4/Cycles#Path_Guiding --- pkgs/applications/misc/blender/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 9fb6720fddaa..0b368ef1b315 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -15,6 +15,7 @@ , potrace , openxr-loader , embree, gmp, libharu +, openpgl , mesa , runCommand }: @@ -58,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: rec { potrace libharu libepoxy + openpgl ] ++ lib.optionals waylandSupport [ wayland wayland-protocols libffi libdecor libxkbcommon dbus