Unverified Commit f6cab26a authored by annalee's avatar annalee
Browse files

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.
parent 653e323f

pkgs/development/python-modules/scs/default.nix

+12 −2
Original line number Diff line number Diff line
@@ -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 = [

pkgs/top-level/python-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -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 { };