diff --git a/pkgs/development/libraries/openimagedenoise/1_2_x.nix b/pkgs/development/libraries/openimagedenoise/1_2_x.nix new file mode 100644 index 0000000000000..10f6abd79ef81 --- /dev/null +++ b/pkgs/development/libraries/openimagedenoise/1_2_x.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchzip, cmake, tbb, python3, ispc }: + +stdenv.mkDerivation rec { + pname = "openimagedenoise"; + version = "1.2.2"; + + # The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs + src = fetchzip { + url = "https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"; + sha256 = "0wyaarjxkzlvljmpnr7qm06ma2wl1aik3z664gwpzhizswygk6yp"; + }; + + nativeBuildInputs = [ cmake python3 ispc ]; + buildInputs = [ tbb ]; + + meta = with lib; { + homepage = "https://openimagedenoise.github.io"; + description = "High-Performance Denoising Library for Ray Tracing"; + license = licenses.asl20; + maintainers = [ maintainers.leshainc ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/openimagedenoise/default.nix b/pkgs/development/libraries/openimagedenoise/default.nix index 03f9118ef7c03..61ffdcbb5cac8 100644 --- a/pkgs/development/libraries/openimagedenoise/default.nix +++ b/pkgs/development/libraries/openimagedenoise/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchzip, cmake, tbb, python, ispc }: +{ lib, stdenv, fetchzip, cmake, tbb, python3, ispc }: stdenv.mkDerivation rec { pname = "openimagedenoise"; - version = "1.2.2"; + version = "1.3.0"; # The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs src = fetchzip { url = "https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"; - sha256 = "0wyaarjxkzlvljmpnr7qm06ma2wl1aik3z664gwpzhizswygk6yp"; + sha256 = "sha256-ls0F2D5pC+wqhQn1Zh8m8Q/KoK7rAkhKatTY9k+letQ="; }; - nativeBuildInputs = [ cmake python ispc ]; + nativeBuildInputs = [ cmake python3 ispc ]; buildInputs = [ tbb ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 923c499787429..6595e9a47801d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6346,7 +6346,9 @@ in lzip = callPackage ../tools/compression/lzip { }; - luxcorerender = callPackage ../tools/graphics/luxcorerender { }; + luxcorerender = callPackage ../tools/graphics/luxcorerender { + openimagedenoise = openimagedenoise_1_2_x; + }; xz = callPackage ../tools/compression/xz { }; @@ -7047,6 +7049,8 @@ in openimagedenoise = callPackage ../development/libraries/openimagedenoise { }; + openimagedenoise_1_2_x = callPackage ../development/libraries/openimagedenoise/1_2_x.nix { }; + openmvg = callPackage ../applications/science/misc/openmvg { }; openmvs = callPackage ../applications/science/misc/openmvs { };