From fa4b98ed6e20ed87006daab312834e113e09d9e3 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:32:12 +0000 Subject: [PATCH] xgboost: move defaults to package file --- pkgs/development/libraries/xgboost/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index ad1cc2efc87..b4c79d7f816 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchgit, cmake -, cudaSupport ? false, cudatoolkit +{ config, stdenv, lib, fetchgit, cmake +, cudaSupport ? config.cudaSupport or false, cudatoolkit , ncclSupport ? false, nccl , llvmPackages }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 890e2686283..92bf93e95ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12993,9 +12993,7 @@ in xalanc = callPackage ../development/libraries/xalanc {}; - xgboost = callPackage ../development/libraries/xgboost { - cudaSupport = config.cudaSupport or false; - }; + xgboost = callPackage ../development/libraries/xgboost { }; xgeometry-select = callPackage ../tools/X11/xgeometry-select { };