From a33ae59eeb935515194f8edabbabe0df767fa8ba Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Fri, 15 Dec 2023 01:10:37 +0000 Subject: nvidia-optical-flow-sdk: refactor: propagation via setupCudaHook --- .../libraries/nvidia-optical-flow-sdk/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix b/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix index 2914d059cfaf..813821bfb71c 100644 --- a/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix +++ b/pkgs/development/libraries/nvidia-optical-flow-sdk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, cudaPackages }: stdenv.mkDerivation { pname = "nvidia-optical-flow-sdk"; @@ -18,10 +18,12 @@ stdenv.mkDerivation { cp -R * $out/include ''; - postFixup = '' - mkdir -p $out/nix-support - echo $pname >> "$out/nix-support/include-in-cudatoolkit-root" - ''; + # Makes setupCudaHook propagate nvidia-optical-flow-sdk together with cuda + # packages. Currently used by opencv4.cxxdev, hopefully can be removed in the + # future + nativeBuildInputs = [ + cudaPackages.markForCudatoolkitRootHook + ]; meta = with lib; { description = "Nvidia optical flow headers for computing the relative motion of pixels between images"; -- cgit 1.4.1