Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: babf5477f539
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 948b38300d72
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 29, 2020

  1. vtkWithQt4: actually build QVTK libs/headers (#84772) 

    - VTK_USE_QT is obsolete and didn't have the intended effect
    @bcdarwin
    bcdarwin authored Apr 29, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    rasendubi Oleksii Shmalko
    GPG key ID: DCEF7BCCEB3066C3
    Verified
    Learn about vigilant mode
    Copy the full SHA
    948b383 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/development/libraries/vtk/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/libraries/vtk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
# At least, we use -fPIC for other packages to be able to use this in shared
# objects.
cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" "-DVTK_USE_SYSTEM_TIFF=1" "-DOPENGL_INCLUDE_DIR=${libGL}/include" ]
++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ]
++ optional (qtLib != null) [ "-DVTK_Group_Qt:BOOL=ON" ]
++ optional stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ]
++ optional enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" ];

@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {

meta = {
description = "Open source libraries for 3D computer graphics, image processing and visualization";
homepage = "http://www.vtk.org/";
homepage = "https://www.vtk.org/";
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ knedlsepp ];
platforms = with stdenv.lib.platforms; unix;