nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-13 18:47:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

vtk_7: remove

Browse Source
This commit is contained in:
Ben Darwin 2022-09-01 14:21:11 -04:00
parent 671b701d28
commit 1d28e5aa47
3 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/libraries/vtk/7.x.nix
View File

@ -1,22 +0,0 @@
import ./generic.nix {
majorVersion = "7.1";
minorVersion = "1";
sourceSha256 = "0nm7xwwj7rnsxjdv2ssviys8nhci4n9iiiqm2y14s520hl2dsp1d";
patchesToFetch = [
{
url = "https://gitlab.kitware.com/vtk/vtk/-/commit/706f1b397df09a27ab8981ab9464547028d0c322.diff";
sha256 = "1q3pi5h40g05pzpbqp75xlgzvbfvyw8raza51svmi7d8dlslqybx";
}
{
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/vtk/files/vtk-8.2.0-gcc-10.patch?id=c4256f68d3589570443075eccbbafacf661f785f";
sha256 = "sha256:0bpwrdfmi15grsg4jy7bzj2z6511a0c160cmw5lsi65aabyh7cl5";
}
# Add missing include required with recent Qt.
{
url = "https://gitlab.kitware.com/vtk/vtk/-/commit/797f28697d5ba50c1fa2bc5596af626a3c277826.diff";
sha256 = "BFjoKws1hVD3Ly9RS4lGN62J6RTyI1E8ATHrZdzg7ds=";
}
];
}

2
pkgs/development/libraries/vtk/generic.nix
View File

@ -96,6 +96,6 @@ in stdenv.mkDerivation rec {
maintainers = with maintainers; [ knedlsepp tfmoraes lheckemann ];
platforms = with platforms; unix;
# /nix/store/xxxxxxx-apple-framework-Security/Library/Frameworks/Security.framework/Headers/Authorization.h:192:7: error: variably modified 'bytes' at file scope
broken = stdenv.isDarwin && (lib.versions.major majorVersion == "7" || lib.versions.major majorVersion == "8");
broken = stdenv.isDarwin && (lib.versions.major majorVersion == "8");
};
}

8
pkgs/top-level/all-packages.nix
View File

@ -21867,14 +21867,6 @@ with pkgs;
vte_290 = callPackage ../development/libraries/vte/2.90.nix { };
vtk_7 = libsForQt515.callPackage ../development/libraries/vtk/7.x.nix {
stdenv = gcc9Stdenv;
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.libs) xpc;
inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration
IOKit CFNetwork Security ApplicationServices
CoreText IOSurface ImageIO OpenGL GLUT;
};
vtk_8 = libsForQt515.callPackage ../development/libraries/vtk/8.x.nix {
stdenv = gcc9Stdenv;
inherit (darwin) libobjc;