Now Passing

2023-05-23 13:15:36 -04:00
parent dcea1444c3
commit 175d46bdd9
14 changed files with 132 additions and 398 deletions
--- a/pkgs/mfix/mfixgui.nix
+++ b/pkgs/mfix/mfixgui.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, fetchFromGitHub, buildPythonApplication, sphinx, sphinx_rtd_theme
+{ lib, fetchurl, fetchFromGitHub, buildPythonApplication, sphinx, sphinx-rtd-theme
 , mfixsolver
 , numpy, psutil, pyqtgraph, qtpy, pyqt5, vtk, requests, simpleeval, simplejson }:

@@ -65,7 +65,7 @@ buildPythonApplication rec {
  '';

  nativeBuildInputs = [
-    sphinx sphinx_rtd_theme
+    sphinx sphinx-rtd-theme
  ];

  buildInputs = [
--- a/pkgs/mfix/mfixsolver.nix
+++ b/pkgs/mfix/mfixsolver.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchFromGitHub
-, cmake, gfortran, python, pkgconfig
+, cmake, gfortran, python38, pkg-config
 , openmpi, netcdf, boost }:

 stdenv.mkDerivation rec {
@@ -55,8 +55,8 @@ stdenv.mkDerivation rec {
  ];

  nativeBuildInputs = [
-    python
-    pkgconfig
+    python38
+    pkg-config
  ];

  buildInputs = [