cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #106975 from tfmoraes/vtk_qt515

Browse source 
vtk: qt514 -> qt515
This commit is contained in:
Kevin Cox 2020-12-24 12:48:00 -05:00 committed by GitHub
commit c1f95fedb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/libraries/vtk/default.nix
View file

@ -22,6 +22,14 @@ stdenv.mkDerivation rec {
sha256 = "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl"; 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 ]; nativeBuildInputs = [ cmake ];
buildInputs = [ libtiff ] buildInputs = [ libtiff ]

2
pkgs/top-level/all-packages.nix
View file

@ -16440,7 +16440,7 @@ in
vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { }; vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { };
vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { }; vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { };
vtkWithQt5 = vtk.override { qtLib = qt514; }; vtkWithQt5 = vtk.override { qtLib = qt515; };
vxl = callPackage ../development/libraries/vxl { vxl = callPackage ../development/libraries/vxl {
libpng = libpng12; libpng = libpng12;