From a6a502fca05a308a727450978417240e2f6ee0d7 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 20 Apr 2020 15:51:34 -0500 Subject: [PATCH] magma: remove mklSupport flag This now relies on the "blas" and "lapack" packages. --- .../libraries/science/math/magma/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix index b34139e7f484..dbe162c60b34 100644 --- a/pkgs/development/libraries/science/math/magma/default.nix +++ b/pkgs/development/libraries/science/math/magma/default.nix @@ -1,8 +1,4 @@ -{ stdenv, fetchurl, cmake, gfortran, cudatoolkit, libpthreadstubs, lapack, blas -, mklSupport ? false, mkl ? null -}: - -assert !mklSupport || mkl != null; +{ stdenv, fetchurl, cmake, gfortran, cudatoolkit, libpthreadstubs, lapack, blas }: with stdenv.lib; @@ -17,13 +13,10 @@ in stdenv.mkDerivation { name = "magma-${version}.tar.gz"; }; - buildInputs = [ gfortran cudatoolkit libpthreadstubs cmake ] - ++ (if mklSupport then [ mkl ] else [ lapack blas ]); + buildInputs = [ gfortran cudatoolkit libpthreadstubs cmake lapack blas ]; doCheck = false; - MKLROOT = optionalString mklSupport mkl; - preConfigure = '' export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++ '';