From 7c8a2e93c9175acda78f10bfdf657de14d0eeeca Mon Sep 17 00:00:00 2001 From: Vladimir Korolev Date: Thu, 13 May 2021 10:46:41 +0300 Subject: [PATCH] openmodelica: openblas -> blas, lapack according to #83888 --- .../science/misc/openmodelica/combined/default.nix | 4 ++-- .../science/misc/openmodelica/omcompiler/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/misc/openmodelica/combined/default.nix b/pkgs/applications/science/misc/openmodelica/combined/default.nix index 83199e41aed37..c3f93e11216df 100644 --- a/pkgs/applications/science/misc/openmodelica/combined/default.nix +++ b/pkgs/applications/science/misc/openmodelica/combined/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, openmodelica, symlinkJoin, gnumake, openblas, makeWrapper}: +{stdenv, lib, openmodelica, symlinkJoin, gnumake, blas, lapack, makeWrapper}: with openmodelica; symlinkJoin { name = "openmodelica-combined"; @@ -10,7 +10,7 @@ symlinkJoin { wrapProgram $out/bin/OMEdit \ --prefix PATH : "${gnumake}/bin" \ --prefix PATH : "${stdenv.cc}/bin" \ - --prefix LIBRARY_PATH : "${lib.makeLibraryPath [openblas]}" \ + --prefix LIBRARY_PATH : "${lib.makeLibraryPath [blas lapack]}" \ --set-default OPENMODELICALIBRARY "${omlibrary}/lib/omlibrary" ''; } diff --git a/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix b/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix index fdfe4c9394738..8fb309465c245 100644 --- a/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix @@ -1,4 +1,4 @@ -{gfortran, flex, bison, jre8, openblas, curl, readline, expat, +{gfortran, flex, bison, jre8, blas, lapack, curl, readline, expat, libffi, binutils, mkOpenModelicaDerivation}: mkOpenModelicaDerivation rec { @@ -10,7 +10,7 @@ mkOpenModelicaDerivation rec { nativeBuildInputs = [jre8 gfortran flex bison]; - buildInputs = [openblas curl readline expat libffi binutils]; + buildInputs = [blas lapack curl readline expat libffi binutils]; preFixup = '' for entry in $(find $out -name libipopt.so); do