diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-05 19:27:16 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-05 19:41:25 +0100 |
commit | 419bc0a4cdc0f577062f6c439809f4bf6e3b0c63 (patch) | |
tree | 0f39c63fcddea75c562825d53a3f36bbba8b7930 /pkgs/applications/graphics/paraview | |
parent | 873e6a4e65451be32e8dcd6151e1f26262ef35f2 (diff) | |
download | nixpkgs-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.tar nixpkgs-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.tar.gz nixpkgs-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.tar.bz2 nixpkgs-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.tar.lz nixpkgs-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.tar.xz nixpkgs-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.tar.zst nixpkgs-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.zip |
Revert "Revert "Merge master into staging-next""
In 87a19e9048773d5a363679617406ad148d36c3b8 I merged staging-next into master using the GitHub gui as intended. In ac241fb7a570d6cf81d229ad22a8889602639160 I merged master into staging-next for the next staging cycle, however, I accidentally pushed it to master. Thinking this may cause trouble, I reverted it in 0be87c79797a5fa384fbc356c74ed54f9f7829ea. This was however wrong, as it "removed" master. This reverts commit 0be87c79797a5fa384fbc356c74ed54f9f7829ea.
Diffstat (limited to 'pkgs/applications/graphics/paraview')
-rw-r--r-- | pkgs/applications/graphics/paraview/default.nix | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index d0351e98ee0..ac01c28ebd4 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,9 +1,5 @@ -{ -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"; @@ -53,20 +49,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 - postInstall = '' - wrapProgram $out/bin/paraview \ + preFixup = '' + wrapQtApp $out/bin/paraview \ --prefix PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" - wrapProgram $out/bin/pvbatch \ + wrapQtApp $out/bin/pvbatch \ --prefix PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" - wrapProgram $out/bin/pvpython \ + wrapQtApp $out/bin/pvpython \ --prefix PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.paraview.org/; description = "3D Data analysis and visualization application"; - license = stdenv.lib.licenses.free; - maintainers = with stdenv.lib.maintainers; [guibert]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.free; + maintainers = with maintainers; [ guibert ]; + platforms = platforms.linux; }; } |