diff options
| author | Thiago Franco de Moraes <totonixsame@gmail.com> | 2020-12-15 15:31:55 -0300 |
|---|---|---|
| committer | Thiago Franco de Moraes <totonixsame@gmail.com> | 2020-12-15 15:31:55 -0300 |
| commit | e78a2d39f0e33a0c35918e255f31d848dd48e138 (patch) | |
| tree | 4f12b1a41c7815008d8794ffb40cd72157e625b9 | |
| parent | a8d2b7b42e89a0c47b2b66d99ee86dd78bb4ae2c (diff) | |
| download | nixpkgs-e78a2d39f0e33a0c35918e255f31d848dd48e138.tar nixpkgs-e78a2d39f0e33a0c35918e255f31d848dd48e138.tar.gz nixpkgs-e78a2d39f0e33a0c35918e255f31d848dd48e138.tar.bz2 nixpkgs-e78a2d39f0e33a0c35918e255f31d848dd48e138.tar.lz nixpkgs-e78a2d39f0e33a0c35918e255f31d848dd48e138.tar.xz nixpkgs-e78a2d39f0e33a0c35918e255f31d848dd48e138.tar.zst nixpkgs-e78a2d39f0e33a0c35918e255f31d848dd48e138.zip | |
vtk: qt514 -> qt515
| -rw-r--r-- | pkgs/development/libraries/vtk/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 4ef140a0999..114c5d19397 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -22,6 +22,14 @@ stdenv.mkDerivation rec { sha256 = "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl"; }; + patches = [ + # Fix compilation with Qt 5.15 + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/vtk/files/vtk-8.2.0-qt-5.15.patch?id=3ca9613d7ad604c93d714e29b116952561e4e41c"; + sha256 = "sha256-BFjoKws1hVD3Ly9RS4lGN62J6RTyI1E8ATHrZdzg7ds="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ libtiff ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb8ba06ac00..21a2e49a7ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16416,7 +16416,7 @@ in vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { }; vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { }; - vtkWithQt5 = vtk.override { qtLib = qt514; }; + vtkWithQt5 = vtk.override { qtLib = qt515; }; vxl = callPackage ../development/libraries/vxl { libpng = libpng12; |