From d0fb4235c4312f31a770f200be15fd56dda92693 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 9 Apr 2022 13:55:15 +0200 Subject: [PATCH] xgboost: fix eval without aliases See https://github.com/NixOS/nixpkgs/pull/167016#issuecomment-1093953843 --- pkgs/development/libraries/xgboost/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index 6186661a12c2..7d50d2b53b1d 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -6,9 +6,8 @@ , gtest , doCheck ? true , cudaSupport ? config.cudaSupport or false -, cudatoolkit , ncclSupport ? false -, nccl +, cudaPackages , llvmPackages }: @@ -28,12 +27,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp; - buildInputs = [ gtest ] ++ lib.optional cudaSupport cudatoolkit - ++ lib.optional ncclSupport nccl; + buildInputs = [ gtest ] ++ lib.optional cudaSupport cudaPackages.cudatoolkit + ++ lib.optional ncclSupport cudaPackages.nccl; cmakeFlags = lib.optionals doCheck [ "-DGOOGLE_TEST=ON" ] - ++ lib.optionals cudaSupport [ "-DUSE_CUDA=ON" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" ] - ++ lib.optionals (cudaSupport && lib.versionAtLeast cudatoolkit.version "11.4.0") [ "-DBUILD_WITH_CUDA_CUB=ON" ] + ++ lib.optionals cudaSupport [ "-DUSE_CUDA=ON" "-DCUDA_HOST_COMPILER=${cudaPackages.cudatoolkit.cc}/bin/cc" ] + ++ lib.optionals (cudaSupport && lib.versionAtLeast cudaPackages.cudatoolkit.version "11.4.0") [ "-DBUILD_WITH_CUDA_CUB=ON" ] ++ lib.optionals ncclSupport [ "-DUSE_NCCL=ON" ]; inherit doCheck;