cudaPackages: patch for issue#434096 modifying setup hook

user.name 64169e99 bb3443a8

Changed files
+7 -11
pkgs
development
cuda-modules
packages
saxpy
setupCudaHook
-9
pkgs/development/cuda-modules/packages/saxpy/package.nix
···
cmakeFlags = [
(lib.cmakeBool "CMAKE_VERBOSE_MAKEFILE" true)
(lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString)
-
(lib.cmakeBool "CMAKE_SKIP_INSTALL_RPATH" false)
-
(lib.cmakeBool "CMAKE_SKIP_RPATH" false)
-
(lib.cmakeBool "CMAKE_INSTALL_RPATH_USE_LINK_PATH" true)
-
(lib.cmakeFeature "CMAKE_INSTALL_RPATH" (
-
lib.makeLibraryPath [
-
(getLib libcublas)
-
cuda_cudart
-
]
-
))
];
passthru.gpuCheck = saxpy.overrideAttrs (_: {
···
cmakeFlags = [
(lib.cmakeBool "CMAKE_VERBOSE_MAKEFILE" true)
(lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString)
];
passthru.gpuCheck = saxpy.overrideAttrs (_: {
+7 -2
pkgs/development/cuda-modules/packages/setupCudaHook/setup-cuda-hook.sh
···
fi
done
-
appendToVar cmakeFlags "-DCUDAToolkit_INCLUDE_DIR=$CUDAToolkit_INCLUDE_DIR"
-
appendToVar cmakeFlags "-DCUDAToolkit_ROOT=$CUDAToolkit_ROOT"
}
preConfigureHooks+=(setupCUDAToolkit_ROOT)
···
fi
done
+
# Use array form so semicolon-separated lists are passed safely.
+
if [[ -n "${CUDAToolkit_INCLUDE_DIR-}" ]]; then
+
cmakeFlagsArray+=("-DCUDAToolkit_INCLUDE_DIR=${CUDAToolkit_INCLUDE_DIR}")
+
fi
+
if [[ -n "${CUDAToolkit_ROOT-}" ]]; then
+
cmakeFlagsArray+=("-DCUDAToolkit_ROOT=${CUDAToolkit_ROOT}")
+
fi
}
preConfigureHooks+=(setupCUDAToolkit_ROOT)