Merge pull request #79166 from wucke13/master

paraview: add wrapQtAppsHook
This commit is contained in:
worldofpeace 2020-02-05 07:08:32 -05:00 committed by GitHub
commit d7b56dda7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,9 +1,5 @@
{ { stdenv, fetchFromGitHub, cmake, makeWrapper, qtbase , qttools, python
stdenv, fetchFromGitHub, cmake, makeWrapper , libGLU, libGL , libXt, qtx11extras, qtxmlpatterns , mkDerivation }:
,qtbase, qttools, python, libGLU, libGL
,libXt, qtx11extras, qtxmlpatterns
, mkDerivation
}:
mkDerivation rec { mkDerivation rec {
pname = "paraview"; pname = "paraview";
@ -53,20 +49,20 @@ mkDerivation rec {
# Paraview links into the Python library, resolving symbolic links on the way, # Paraview links into the Python library, resolving symbolic links on the way,
# so we need to put the correct sitePackages (with numpy) back on the path # so we need to put the correct sitePackages (with numpy) back on the path
postInstall = '' preFixup = ''
wrapProgram $out/bin/paraview \ wrapQtApp $out/bin/paraview \
--prefix PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" --prefix PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}"
wrapProgram $out/bin/pvbatch \ wrapQtApp $out/bin/pvbatch \
--prefix PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" --prefix PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}"
wrapProgram $out/bin/pvpython \ wrapQtApp $out/bin/pvpython \
--prefix PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" --prefix PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}"
''; '';
meta = { meta = with stdenv.lib; {
homepage = http://www.paraview.org/; homepage = http://www.paraview.org/;
description = "3D Data analysis and visualization application"; description = "3D Data analysis and visualization application";
license = stdenv.lib.licenses.free; license = licenses.free;
maintainers = with stdenv.lib.maintainers; [guibert]; maintainers = with maintainers; [ guibert ];
platforms = with stdenv.lib.platforms; linux; platforms = platforms.linux;
}; };
} }