openmodelica: openblas -> blas, lapack according to NixOS#83888

balodja · May 13, 2021 · 7c8a2e9 · 7c8a2e9
1 parent 2fe25d5
commit 7c8a2e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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