public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openimagedenoise: 1.2.2 -> 1.3.0

Browse Source 
Moved 1.2.2 to an extra file, as we still need it for luxcorerender to
build.

https://github.com/LuxCoreRender/LuxCore/pull/482#issuecomment-744343949

Also build with python3.
This commit is contained in:
Justin Humm 2021-04-03 17:48:11 +02:00
parent 24d04bc192
commit 0e31f60cad
3 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/development/libraries/openimagedenoise/1_2_x.nix Normal file
View File

@ -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;
};
}

8
pkgs/development/libraries/openimagedenoise/default.nix
View File

@ -1,16 +1,16 @@
{ lib, stdenv, fetchzip, cmake, tbb, python, ispc }: { lib, stdenv, fetchzip, cmake, tbb, python3, ispc }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "openimagedenoise"; 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 # The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs
src = fetchzip { src = fetchzip {
url = "https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"; 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 ]; buildInputs = [ tbb ];
meta = with lib; { meta = with lib; {

6
pkgs/top-level/all-packages.nix
View File

@ -6346,7 +6346,9 @@ in
lzip = callPackage ../tools/compression/lzip { }; 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 { }; xz = callPackage ../tools/compression/xz { };
@ -7047,6 +7049,8 @@ in
openimagedenoise = callPackage ../development/libraries/openimagedenoise { }; openimagedenoise = callPackage ../development/libraries/openimagedenoise { };
openimagedenoise_1_2_x = callPackage ../development/libraries/openimagedenoise/1_2_x.nix { };
openmvg = callPackage ../applications/science/misc/openmvg { }; openmvg = callPackage ../applications/science/misc/openmvg { };
openmvs = callPackage ../applications/science/misc/openmvs { }; openmvs = callPackage ../applications/science/misc/openmvs { };