summary refs log tree commit diff
path: root/pkgs/development/libraries/science/math/liblapack
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-11-04 20:12:55 -0600
committerMatthew Bauer <mjbauer95@gmail.com>2018-11-04 20:23:12 -0600
commit95373d3634d6431037d8d752513392227c76c66b (patch)
tree0fd1f80c6f007fac0ea9d12ac6420e337f49f2b5 /pkgs/development/libraries/science/math/liblapack
parent4056c436c983763ed848d0e35ffafc7509d07b73 (diff)
downloadnixpkgs-95373d3634d6431037d8d752513392227c76c66b.tar
nixpkgs-95373d3634d6431037d8d752513392227c76c66b.tar.gz
nixpkgs-95373d3634d6431037d8d752513392227c76c66b.tar.bz2
nixpkgs-95373d3634d6431037d8d752513392227c76c66b.tar.lz
nixpkgs-95373d3634d6431037d8d752513392227c76c66b.tar.xz
nixpkgs-95373d3634d6431037d8d752513392227c76c66b.tar.zst
nixpkgs-95373d3634d6431037d8d752513392227c76c66b.zip
atlas: remove
atlas is broken and can apparently be removed.

Fixes #49594
Diffstat (limited to 'pkgs/development/libraries/science/math/liblapack')
-rw-r--r--pkgs/development/libraries/science/math/liblapack/default.nix18
1 files changed, 1 insertions, 17 deletions
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index e6af2251b1f..38260f63d91 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -4,12 +4,9 @@
   gfortran,
   cmake,
   python2,
-  atlas ? null,
   shared ? false
 }:
 let
-  atlasMaybeShared = if atlas != null then atlas.override { inherit shared; }
-                     else null;
   usedLibExtension = if shared then ".so" else ".a";
   inherit (stdenv.lib) optional optionals;
   version = "3.8.0";
@@ -22,7 +19,6 @@ stdenv.mkDerivation rec {
     sha256 = "1xmwi2mqmipvg950gb0rhgprcps8gy8sjm8ic9rgy2qjlv22rcny";
   };
 
-  propagatedBuildInputs = [ atlasMaybeShared ];
   buildInputs = [ gfortran cmake ];
   nativeBuildInputs = [ python2 ];
 
@@ -30,15 +26,7 @@ stdenv.mkDerivation rec {
     "-DUSE_OPTIMIZED_BLAS=ON"
     "-DCMAKE_Fortran_FLAGS=-fPIC"
   ]
-  ++ (optionals (atlas != null) [
-    "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}"
-    "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}"
-  ])
-  ++ (optional shared "-DBUILD_SHARED_LIBS=ON")
-  # If we're on darwin, CMake will automatically detect impure paths. This switch
-  # prevents that.
-  ++ (optional stdenv.isDarwin "-DCMAKE_OSX_SYSROOT:PATH=''")
-  ;
+  ++ (optional shared "-DBUILD_SHARED_LIBS=ON");
 
   doCheck = ! shared;
 
@@ -48,10 +36,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru = {
-    blas = atlas;
-  };
-
   meta = with stdenv.lib; {
     inherit version;
     description = "Linear Algebra PACKage";