Commit 64169e99 authored by user.name's avatar user.name
Browse files

cudaPackages: patch for issue#434096 modifying setup hook

parent bb3443a8

pkgs/development/cuda-modules/packages/saxpy/package.nix

+0 −9
Original line number Diff line number Diff line
@@ -43,15 +43,6 @@ backendStdenv.mkDerivation { 
  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 (_: {

pkgs/development/cuda-modules/packages/setupCudaHook/setup-cuda-hook.sh

+7 −2
Original line number Diff line number Diff line
@@ -54,8 +54,13 @@ setupCUDAToolkit_ROOT() { 
        fi

    done



    appendToVar cmakeFlags "-DCUDAToolkit_INCLUDE_DIR=$CUDAToolkit_INCLUDE_DIR"

    appendToVar cmakeFlags "-DCUDAToolkit_ROOT=$CUDAToolkit_ROOT"

    # 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)