diff options
author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-03-18 07:31:22 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-18 07:31:22 -0400 |
commit | ddf87fb1baf8f5022281dad13fb318fa5c17a7c6 (patch) | |
tree | ed39f91a5d29497793c77d09c4a901f095713980 | |
parent | 201ac90018d0c621a6f8e2e87206a50ec3eae2f5 (diff) | |
parent | 3c54b996ca1663f3bcff7d8e49349c4510e85563 (diff) | |
download | nixlib-ddf87fb1baf8f5022281dad13fb318fa5c17a7c6.tar nixlib-ddf87fb1baf8f5022281dad13fb318fa5c17a7c6.tar.gz nixlib-ddf87fb1baf8f5022281dad13fb318fa5c17a7c6.tar.bz2 nixlib-ddf87fb1baf8f5022281dad13fb318fa5c17a7c6.tar.lz nixlib-ddf87fb1baf8f5022281dad13fb318fa5c17a7c6.tar.xz nixlib-ddf87fb1baf8f5022281dad13fb318fa5c17a7c6.tar.zst nixlib-ddf87fb1baf8f5022281dad13fb318fa5c17a7c6.zip |
Merge pull request #82736 from LeshaInc/master
blender: add OpenImageDenoise support
-rw-r--r-- | maintainers/maintainer-list.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/blender/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/openimagedenoise/default.nix | 25 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
4 files changed, 35 insertions, 2 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2963fa6789b5..336ee7a88306 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4148,6 +4148,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/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 338a5249aebb..e27aca4fc3d1 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 diff --git a/pkgs/development/libraries/openimagedenoise/default.nix b/pkgs/development/libraries/openimagedenoise/default.nix new file mode 100644 index 000000000000..5cecc33564e4 --- /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 be48be8e2b57..da01b5135e90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5561,6 +5561,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 { }; |