openmodelica: now coherent with NixOS#89731 and NixOS#109595

balodja · May 12, 2021 · c44bb3c · c44bb3c
1 parent ce0ba4b
commit c44bb3c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
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, jre, openblas, curl, readline, expat,
+{gfortran, flex, bison, jre8, openblas, curl, readline, expat,
 libffi, binutils, mkOpenModelicaDerivation}:
 
 mkOpenModelicaDerivation rec {
@@ -8,9 +8,9 @@ mkOpenModelicaDerivation rec {
   omdeps = [];
   omautoconf = true;
 
-  nativeBuildInputs = [gfortran flex bison];
+  nativeBuildInputs = [jre8 gfortran flex bison];
 
-  buildInputs = [jre openblas curl readline expat libffi binutils];
+  buildInputs = [openblas curl readline expat libffi binutils];
 
   preFixup = ''
     for entry in $(find $out -name libipopt.so); do

diff --git a/pkgs/applications/science/misc/openmodelica/omedit/default.nix b/pkgs/applications/science/misc/openmodelica/omedit/default.nix
@@ -1,4 +1,4 @@
-{lib, jre, qmake, qtbase, qttools, qtwebkit, qtxmlpatterns, binutils, wrapQtAppsHook,
+{lib, jre8, qmake, qtbase, qttools, qtwebkit, qtxmlpatterns, binutils, wrapQtAppsHook,
 openmodelica, mkOpenModelicaDerivation}:
 with openmodelica;
 mkOpenModelicaDerivation rec {
@@ -7,7 +7,7 @@ mkOpenModelicaDerivation rec {
   omdeps = [omcompiler omplot omparser omsimulator];
   omautoconf = true;
 
-  nativeBuildInputs = [jre qmake qtbase qttools wrapQtAppsHook];
+  nativeBuildInputs = [jre8 qmake qtbase qttools wrapQtAppsHook];
 
   buildInputs = [qtwebkit qtxmlpatterns binutils];
 

diff --git a/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix b/pkgs/applications/science/misc/openmodelica/omlibrary/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchgit, bash, pkgconfig, jre, libuuid,
+{lib, stdenv, fetchgit, bash, pkg-config, jre8, libuuid,
 openmodelica, mkOpenModelicaDerivation }:
 let
   fakegit = import ./fakegit.nix { inherit lib stdenv fetchgit bash; };

diff --git a/pkgs/applications/science/misc/openmodelica/omparser/default.nix b/pkgs/applications/science/misc/openmodelica/omparser/default.nix
@@ -1,14 +1,14 @@
-{pkgconfig, jre, libuuid,
+{pkg-config, jre8, libuuid,
 openmodelica, mkOpenModelicaDerivation }:
 
 mkOpenModelicaDerivation rec {
   pname = "omparser";
   omdir = "OMParser";
   omdeps = [openmodelica.omcompiler];
 
-  nativeBuildInputs = [pkgconfig];
+  nativeBuildInputs = [pkg-config];
 
-  buildInputs = [jre libuuid];
+  buildInputs = [jre8 libuuid];
 
   patchPhase = ''
     patch -p1 < ${./Makefile.in.patch}

diff --git a/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix b/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix
@@ -1,12 +1,12 @@
-{pkgconfig, readline, libxml2,
+{pkg-config, readline, libxml2,
 openmodelica, mkOpenModelicaDerivation}:
 
 mkOpenModelicaDerivation rec {
   pname = "omsimulator";
   omdir = "OMSimulator";
   omdeps = [openmodelica.omcompiler];
 
-  nativeBuildInputs = [pkgconfig];
+  nativeBuildInputs = [pkg-config];
 
   buildInputs = [readline libxml2];
 }