From 2cc3a34d4a8e245aae97566cf0077a8ae70c141b Mon Sep 17 00:00:00 2001
From: LeshaInc <includeurl@gmail.com>
Date: Mon, 16 Mar 2020 19:15:53 +0200
Subject: [PATCH 1/2] openimagedenoise: init at 1.1.0

---
 maintainers/maintainer-list.nix               |  6 +++++
 .../libraries/openimagedenoise/default.nix    | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/libraries/openimagedenoise/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 993e5c2d46d..a38dccb27e1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4142,6 +4142,12 @@
     github = "leonardoce";
     name = "Leonardo Cecchi";
   };
+  leshainc = {
+    email = "leshainc@fomalhaut.me";
+    github = "LeshaInc";
+    githubId = 42153076;
+    name = "Alexey Nikashkin";
+  };
   lethalman = {
     email = "lucabru@src.gnome.org";
     github = "lethalman";
diff --git a/pkgs/development/libraries/openimagedenoise/default.nix b/pkgs/development/libraries/openimagedenoise/default.nix
new file mode 100644
index 00000000000..5cecc33564e
--- /dev/null
+++ b/pkgs/development/libraries/openimagedenoise/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, cmake, tbb, python }:
+
+stdenv.mkDerivation rec {
+  pname = "openimagedenoise";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "OpenImageDenoise";
+    repo = "oidn";
+    rev = "v${version}";
+    sha256 = "032s7vablqnmrcc4xf2c94kwj0kbcd64bram10g0yc42fg0a3r9m";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [ cmake python ];
+  buildInputs = [ tbb ];
+
+  meta = with stdenv.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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e45856b05d..5ea8fb5d7b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5556,6 +5556,8 @@ in
 
   openjade = callPackage ../tools/text/sgml/openjade { };
 
+  openimagedenoise = callPackage ../development/libraries/openimagedenoise { };
+
   openmvg = callPackage ../applications/science/misc/openmvg { };
 
   openmvs = callPackage ../applications/science/misc/openmvs { };

From 3c54b996ca1663f3bcff7d8e49349c4510e85563 Mon Sep 17 00:00:00 2001
From: LeshaInc <includeurl@gmail.com>
Date: Mon, 16 Mar 2020 19:18:58 +0200
Subject: [PATCH 2/2] blender: build with OpenImageDenoise support

---
 pkgs/applications/misc/blender/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 338a5249aeb..e27aca4fc3d 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -1,7 +1,7 @@
 { config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew
 , ilmbase, libXi, libX11, libXext, libXrender
 , libjpeg, libpng, libsamplerate, libsndfile
-, libtiff, libGLU, libGL, openal, opencolorio, openexr, openimageio2, openjpeg, python3Packages
+, libtiff, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python3Packages
 , openvdb, libXxf86vm, tbb, alembic
 , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath
 , jackaudioSupport ? false, libjack2
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ boost ffmpeg gettext glew ilmbase
       freetype libjpeg libpng libsamplerate libsndfile libtiff
-      opencolorio openexr openimageio2 openjpeg python zlib fftw jemalloc
+      opencolorio openexr openimagedenoise openimageio2 openjpeg python zlib fftw jemalloc
       alembic
       (opensubdiv.override { inherit cudaSupport; })
       tbb