diff options
author | annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2023-11-17 21:06:05 +0000 |
---|---|---|
committer | annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> | 2023-11-19 00:11:04 +0000 |
commit | f6cab26a11dd6fe621ce2e399e3211754c39d5e7 (patch) | |
tree | ad5779914a82e95f45f1f7d8f79ef35195110e8e | |
parent | 653e323f3a5a62f4f640755e66297d8243dc0695 (diff) | |
download | nixpkgs-f6cab26a11dd6fe621ce2e399e3211754c39d5e7.tar nixpkgs-f6cab26a11dd6fe621ce2e399e3211754c39d5e7.tar.gz nixpkgs-f6cab26a11dd6fe621ce2e399e3211754c39d5e7.tar.bz2 nixpkgs-f6cab26a11dd6fe621ce2e399e3211754c39d5e7.tar.lz nixpkgs-f6cab26a11dd6fe621ce2e399e3211754c39d5e7.tar.xz nixpkgs-f6cab26a11dd6fe621ce2e399e3211754c39d5e7.tar.zst nixpkgs-f6cab26a11dd6fe621ce2e399e3211754c39d5e7.zip |
python311Packages.scs: add BLAS & LAPACK env vars; fix build
after numpy updated to 1.26.1 distutils no longer provides the lib locations so use env vars for non-darwin. On darwin Accelerate library is prioritized over BLAS so add Accelerate to buildInputs.
-rw-r--r-- | pkgs/development/python-modules/scs/default.nix | 14 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
2 files changed, 15 insertions, 3 deletions
diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix index 0a242e23137..fdad7daec2d 100644 --- a/pkgs/development/python-modules/scs/default.nix +++ b/pkgs/development/python-modules/scs/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, Accelerate , blas , lapack , numpy @@ -22,9 +23,18 @@ buildPythonPackage rec { fetchSubmodules = true; }; - buildInputs = [ - lapack + env = lib.optionalAttrs (!stdenv.isDarwin) { + # provide lib locations in env vars as numpy distutils 1.26.1 and later + # does not + BLAS = lib.getLib blas; + LAPACK = lib.getLib lapack; + }; + + buildInputs = if stdenv.isDarwin then [ + Accelerate + ] else [ blas + lapack ]; propagatedBuildInputs = [ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 13bd7d07d53..4b29edee0ec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12683,7 +12683,9 @@ self: super: with self; { scikit-survival = callPackage ../development/python-modules/scikit-survival { }; - scs = callPackage ../development/python-modules/scs { }; + scs = callPackage ../development/python-modules/scs { + inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate; + }; sdds = callPackage ../development/python-modules/sdds { }; |