From 72addac9ce0f676120e790e7cc822b59ff817dcf Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 18 Mar 2026 19:41:27 +0000 Subject: [PATCH] openimagedenoise: minor cleanup --- pkgs/by-name/op/openimagedenoise/package.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/op/openimagedenoise/package.nix b/pkgs/by-name/op/openimagedenoise/package.nix index 2982de88dea1..1a94fc54f52b 100644 --- a/pkgs/by-name/op/openimagedenoise/package.nix +++ b/pkgs/by-name/op/openimagedenoise/package.nix @@ -19,10 +19,14 @@ stdenv.mkDerivation (finalAttrs: { # The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs src = fetchzip { url = "https://github.com/RenderKit/oidn/releases/download/v${finalAttrs.version}/oidn-${finalAttrs.version}.src.tar.gz"; - sha256 = "sha256-SM0Bn4qgeqRJAXr2MMjNjfWJVTcciERZxMHiyx4Z1hA="; + hash = "sha256-SM0Bn4qgeqRJAXr2MMjNjfWJVTcciERZxMHiyx4Z1hA="; }; - patches = lib.optional cudaSupport ./cuda.patch; + strictDeps = true; + + patches = lib.optionals cudaSupport [ + ./cuda.patch + ]; postPatch = '' # fix build failure with GCC14 @@ -35,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { python3 ispc ] - ++ lib.optional cudaSupport cudaPackages.cuda_nvcc + ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ]; buildInputs = [ @@ -49,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "OIDN_DEVICE_CUDA" cudaSupport) - (lib.cmakeFeature "TBB_INCLUDE_DIR" "${onetbb.dev}/include") + (lib.cmakeFeature "TBB_INCLUDE_DIR" "${lib.getDev onetbb}/include") (lib.cmakeFeature "TBB_ROOT" "${onetbb}") ];