diff options
| author | superherointj <5861043+superherointj@users.noreply.github.com> | 2023-02-04 17:39:59 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-04 17:39:59 -0300 |
| commit | 22ef577609dadd5574ab735f11cba182f6d69380 (patch) | |
| tree | 1886f2ab6e56e01149105fa8aaea9740147ab6da | |
| parent | 0ca39c30e76d300aebabc71c61fe4cdf84374544 (diff) | |
| parent | 5a8562ac9f1b8ec9ed6005e6bf13e0746447d2c3 (diff) | |
Merge pull request #214577 from bcdarwin/opencv-unpin-vtk
opencv4: unpin vtk
| -rw-r--r-- | pkgs/development/libraries/opencv/4.x.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 5afc209922b5b..2c676e008f00d 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -48,7 +48,7 @@ , enableGtk3 ? false , gtk3 , enableVtk ? false -, vtk_8 +, vtk , enableFfmpeg ? true , ffmpeg , enableGStreamer ? true @@ -253,7 +253,7 @@ stdenv.mkDerivation { ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) hdf5 ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 - ++ lib.optional enableVtk vtk_8 + ++ lib.optional enableVtk vtk ++ lib.optional enableJPEG libjpeg ++ lib.optional enablePNG libpng ++ lib.optional enableTIFF libtiff |