diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-07 00:02:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-07 00:02:25 +0000 |
| commit | 0789ea69b14bc308940691b0a6eb878d737c90c0 (patch) | |
| tree | d136e6f552a5c40f3316bcca7c6d6ae67bde667b /pkgs/tools/graphics | |
| parent | 5b308cd1df5b405ce6c5630454fdb1733e3f8a58 (diff) | |
| parent | 3ad7b8a7e8c2da367d661df6c3742168c53913fa (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/libyafaray/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/graphics/luxcorerender/default.nix | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/tools/graphics/libyafaray/default.nix b/pkgs/tools/graphics/libyafaray/default.nix index 11e3dc6fafd90..db48aa678cc55 100644 --- a/pkgs/tools/graphics/libyafaray/default.nix +++ b/pkgs/tools/graphics/libyafaray/default.nix @@ -1,5 +1,4 @@ -{ boost165 -, cmake +{ cmake , fetchFromGitHub , freetype , ilmbase @@ -37,7 +36,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - boost165 freetype ilmbase libjpeg diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index 75e69a5d4996c..44ba46895fe18 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -1,6 +1,6 @@ { lib, config, stdenv, fetchFromGitHub, symlinkJoin, wrapGAppsHook, cmake, boost172 , pkg-config, flex, bison, libpng, libtiff, zlib, python3, embree, openexr -, openimagedenoise, openimageio, tbb, c-blosc, gtk3, pcre, doxygen +, openimagedenoise, openimageio_1, tbb, c-blosc, gtk3, pcre, doxygen # OpenCL Support , withOpenCL ? true, ocl-icd # Cuda Support @@ -43,8 +43,8 @@ in stdenv.mkDerivation rec { c-blosc gtk3 pcre - openimageio.dev - openimageio.out + openimageio_1.dev + openimageio_1.out ] ++ lib.optionals withOpenCL [ ocl-icd ] ++ lib.optionals withCuda [ cudatoolkit ]; |