-
-
Notifications
You must be signed in to change notification settings - Fork 14.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
vtk: add vtk-dicom module #317335
base: master
Are you sure you want to change the base?
vtk: add vtk-dicom module #317335
Conversation
Hm, gdcm depends on vtk, but at the same time it's used as a dependency for vtk-dicom... |
ok, it doesn't need vtk integration here. |
Result of 3 packages marked as broken and skipped:
4 packages failed to build:
73 packages built:
|
|
Also not sure if it should be enabled by default. I don't see it's being used a lot, but it doesn't break anything. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please rebase to resolve (minor) merge conflicts (you'll also need to run nixfmt
on this file now)
@@ -23,6 +24,18 @@ in stdenv.mkDerivation { | |||
sha256 = sourceSha256; | |||
}; | |||
|
|||
preConfigure = let |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe consider postPatch
here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can do that, but why is it preferable? :)
@@ -48,6 +61,8 @@ in stdenv.mkDerivation { | |||
GLUT | |||
] ++ optionals enablePython [ | |||
python | |||
] ++ optionals enableVtkDicom [ | |||
(gdcm.override { enableVTK = false; }) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe we should consider lifting this to e.g. all-packages.nix say by defining vtkWithGdcm or similar, but I think it's fine?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's vice versa, gdcmWithGtk
. I have no preference, so can move it.
@@ -93,6 +108,12 @@ in stdenv.mkDerivation { | |||
++ optionals enablePython [ | |||
"-DVTK_WRAP_PYTHON:BOOL=ON" | |||
"-DVTK_PYTHON_VERSION:STRING=${pythonMajor}" | |||
] | |||
++ optionals enableVtkDicom [ | |||
"-DVTK_ENABLE_REMOTE_MODULES=YES" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this be a bit narrower e.g. just enabling vtkDICOM, or is VTK_ENABLE_REMOTE_MODULES necessary for some reason?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's actually enabled by default, so removed it.
soft bump |
Updated the MR with |
Description of changes
Add https://github.com/dgobbi/vtk-dicom module. It is needed for https://github.com/eidelen/DicomToMesh
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.