diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-05 19:18:11 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-05 19:18:35 +0100 |
commit | 0be87c79797a5fa384fbc356c74ed54f9f7829ea (patch) | |
tree | 69e2f87d4a1ec8f8962d35e330188afcf8f88dcb /pkgs/applications/graphics | |
parent | ac241fb7a570d6cf81d229ad22a8889602639160 (diff) | |
download | nixlib-0be87c79797a5fa384fbc356c74ed54f9f7829ea.tar nixlib-0be87c79797a5fa384fbc356c74ed54f9f7829ea.tar.gz nixlib-0be87c79797a5fa384fbc356c74ed54f9f7829ea.tar.bz2 nixlib-0be87c79797a5fa384fbc356c74ed54f9f7829ea.tar.lz nixlib-0be87c79797a5fa384fbc356c74ed54f9f7829ea.tar.xz nixlib-0be87c79797a5fa384fbc356c74ed54f9f7829ea.tar.zst nixlib-0be87c79797a5fa384fbc356c74ed54f9f7829ea.zip |
Revert "Merge master into staging-next"
I merged master into staging-next but accidentally pushed it to master. This should get us back to 87a19e9048773d5a363679617406ad148d36c3b8. This reverts commit ac241fb7a570d6cf81d229ad22a8889602639160, reversing changes made to 76a439239eb310d9ad76d998b34d5d3bc0e37acb.
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/paraview/default.nix | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index ac01c28ebd4b..d0351e98ee01 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,5 +1,9 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, qtbase , qttools, python -, libGLU, libGL , libXt, qtx11extras, qtxmlpatterns , mkDerivation }: +{ +stdenv, fetchFromGitHub, cmake, makeWrapper +,qtbase, qttools, python, libGLU, libGL +,libXt, qtx11extras, qtxmlpatterns +, mkDerivation +}: mkDerivation rec { pname = "paraview"; @@ -49,20 +53,20 @@ mkDerivation rec { # 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 - preFixup = '' - wrapQtApp $out/bin/paraview \ + postInstall = '' + wrapProgram $out/bin/paraview \ --prefix PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" - wrapQtApp $out/bin/pvbatch \ + wrapProgram $out/bin/pvbatch \ --prefix PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" - wrapQtApp $out/bin/pvpython \ + wrapProgram $out/bin/pvpython \ --prefix PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" ''; - meta = with stdenv.lib; { + meta = { homepage = http://www.paraview.org/; description = "3D Data analysis and visualization application"; - license = licenses.free; - maintainers = with maintainers; [ guibert ]; - platforms = platforms.linux; + license = stdenv.lib.licenses.free; + maintainers = with stdenv.lib.maintainers; [guibert]; + platforms = with stdenv.lib.platforms; linux; }; } |