paraview: fix Python shell
Fixes `paraview` module import error in pvpython/pvbatch (#215144) by building with Python 3.9. Also implements `mkDerivation` recommendations from #180841.
This commit is contained in:
parent
a86effdd9d
commit
0c63aa1630
@ -1,7 +1,7 @@
|
||||
{ lib, fetchFromGitLab, fetchurl
|
||||
, boost, cmake, ffmpeg, qtbase, qtx11extras
|
||||
{ lib, stdenv, fetchFromGitLab, fetchurl
|
||||
, boost, cmake, ffmpeg, wrapQtAppsHook, qtbase, qtx11extras
|
||||
, qttools, qtxmlpatterns, qtsvg, gdal, gfortran, libXt, makeWrapper
|
||||
, mkDerivation, ninja, mpi, python3, tbb, libGLU, libGL
|
||||
, ninja, mpi, python3, tbb, libGLU, libGL
|
||||
, withDocs ? true
|
||||
}:
|
||||
|
||||
@ -26,7 +26,7 @@ let
|
||||
})
|
||||
];
|
||||
|
||||
in mkDerivation rec {
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "paraview";
|
||||
inherit version;
|
||||
|
||||
@ -68,6 +68,7 @@ in mkDerivation rec {
|
||||
makeWrapper
|
||||
ninja
|
||||
gfortran
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
@ -32118,7 +32118,9 @@ with pkgs;
|
||||
|
||||
pavucontrol = callPackage ../applications/audio/pavucontrol { };
|
||||
|
||||
paraview = libsForQt5.callPackage ../applications/graphics/paraview { };
|
||||
paraview = libsForQt5.callPackage ../applications/graphics/paraview {
|
||||
python3 = python39;
|
||||
};
|
||||
|
||||
parlatype = callPackage ../applications/audio/parlatype { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user