diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-06-01 22:07:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-01 22:07:49 +0200 |
| commit | 34535af7598374ca5daa75650175383861ac51cc (patch) | |
| tree | ee1fb310e66fe29ff3bf6d35520783911a3f4466 /pkgs/applications/science | |
| parent | 872a9c76208d1e4746b56b79d7bd04223caa565d (diff) | |
| parent | e103e932c21dd1affdc6368a29e768f44ab2a76c (diff) | |
Merge pull request #316171 from wegank/omcompiler-fix
openmodelica.omcompiler: fix build
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/misc/openmodelica/omcompiler/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/science/misc/openmodelica/omsimulator/default.nix | 14 |
2 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix b/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix index 360fea56fedfb..82b9f8e36fe1d 100644 --- a/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix @@ -44,6 +44,11 @@ mkOpenModelicaDerivation ({ $(find ./OMCompiler -name 'Makefile*') ''; + env.CFLAGS = toString [ + "-Wno-error=dynamic-exception-spec" + "-Wno-error=implicit-function-declaration" + ]; + preFixup = '' for entry in $(find $out -name libipopt.so); do patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$entry" diff --git a/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix b/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix index d91d427a07703..3cbe1a6a55f10 100644 --- a/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix @@ -5,6 +5,7 @@ , libxml2 , openmodelica , mkOpenModelicaDerivation +, fetchpatch }: mkOpenModelicaDerivation rec { @@ -12,10 +13,23 @@ mkOpenModelicaDerivation rec { omdir = "OMSimulator"; omdeps = [ openmodelica.omcompiler ]; + patches = [ + (fetchpatch { + url = "https://github.com/OpenModelica/OMSimulator/commit/5ef06e251d639a0224adc205cdbfa1f99bf9a956.patch"; + stripLen = 1; + extraPrefix = "OMSimulator/"; + hash = "sha256-hLsS6TNEjddm2o2Optnf8n6hh14up9bWJBoztNmisH0="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ readline libxml2 boost ]; + env.CFLAGS = toString [ + "-Wno-error=implicit-function-declaration" + ]; + meta = with lib; { description = "The OpenModelica FMI & SSP-based co-simulation environment"; homepage = "https://openmodelica.org"; |