Commit 0c63aa16 authored by Alexander Kiselyov's avatar Alexander Kiselyov Committed by David Guibert
Browse files

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.
parent a86effdd
Loading
Loading
Loading
Loading
+5 −4
Original line number Diff line number Diff line
{ 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 = [
+3 −1
Original line number Diff line number Diff line
@@ -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 { };