From dd23a064b14b08af2612121065abc0b76e364647 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:32:10 +0000 Subject: [PATCH] libtensorflow: move defaults to package file --- pkgs/development/libraries/libtensorflow/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libtensorflow/default.nix b/pkgs/development/libraries/libtensorflow/default.nix index f41f6303e014..98096371e400 100644 --- a/pkgs/development/libraries/libtensorflow/default.nix +++ b/pkgs/development/libraries/libtensorflow/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ config, stdenv , fetchurl , patchelf -, cudaSupport ? false, symlinkJoin, cudatoolkit, cudnn, nvidia_x11 +, cudaSupport ? config.cudaSupport or false, symlinkJoin, cudatoolkit, cudnn, nvidia_x11 }: with stdenv.lib; let diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e8ca93f4f19..394b134a7a8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -915,7 +915,6 @@ in tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; libtensorflow = callPackage ../development/libraries/libtensorflow { - cudaSupport = config.cudaSupport or false; inherit (linuxPackages) nvidia_x11; cudatoolkit = cudatoolkit_9_0; cudnn = cudnn_cudatoolkit_9_0;