gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

connectome-workbench: 2.0.1 -> 2.1.0

Browse Source 
Also support building with cmake 4 and bump Qt5 to Qt6.
This commit is contained in:
Ben Darwin
2025-07-18 00:17:36 -04:00
parent 134fe04e1d
commit f0a15b8c4e
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
pkgs/by-name/co/connectome-workbench/package.nix
View File

@@ -6,57 +6,57 @@
cmake, cmake,
libGL, libGL,
libGLU, libGLU,
libsForQt5, qt6,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "connectome-workbench"; pname = "connectome-workbench";
version = "2.0.1"; version = "2.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Washington-University"; owner = "Washington-University";
repo = "workbench"; repo = "workbench";
tag = "v${finalAttrs.version}"; tag = "v${finalAttrs.version}";
hash = "sha256-M5iverVDhBI/ijbgwfa6gHrthY4wrUi+/2A/443jBqg="; hash = "sha256-f1T0i4x7rr3u/3ZvJ4cEAb377e7YcaGMKa2uUslVqR0=";
}; };
sourceRoot = "${finalAttrs.src.name}/src"; sourceRoot = "${finalAttrs.src.name}/src";
patches = [
# remove after next release:
(fetchpatch {
name = "fix-missing-includes-in-CZIlib";
url = "https://github.com/Washington-University/workbench/commit/7ba3345d161d567a4b628ceb02ab4471fc96cb20.diff";
hash = "sha256-DMrJOr/2Wr4o4Z3AuhWfMZTX8f/kOYWwZQzBUwIrTd8=";
relative = "src";
})
];
postPatch = '' postPatch = ''
substituteInPlace CMakeLists.txt \ substituteInPlace kloewe/{cpuinfo,dot}/CMakeLists.txt --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
--replace-fail "ADD_SUBDIRECTORY ( Tests )" "" \ ''
--replace-fail "ENABLE_TESTING()" "" +
''; # tests are minimal and test_driver fails to link (also -DBUILD_TESTING=... is ignored):
# tests are minimal and test_driver fails to link (also -DBUILD_TESTING=... is ignored): # ld: ../Brain/libBrain.a(BrainOpenGLVolumeObliqueSliceDrawing.cxx.o): undefined reference to symbol 'glGetFloatv'
# ld: ../Brain/libBrain.a(BrainOpenGLVolumeObliqueSliceDrawing.cxx.o): undefined reference to symbol 'glGetFloatv' # ld: /nix/store/a5vcvrkh1c2ng5kr584g3zw3991vnhks-libGL-1.7.0/lib/libGL.so.1: error adding symbols: DSO missing from command line
# ld: /nix/store/a5vcvrkh1c2ng5kr584g3zw3991vnhks-libGL-1.7.0/lib/libGL.so.1: error adding symbols: DSO missing from command line ''
substituteInPlace CMakeLists.txt \
--replace-fail "ADD_SUBDIRECTORY ( Tests )" "" \
--replace-fail "ENABLE_TESTING()" ""
'';
env.NIX_CFLAGS_COMPILE = "-fpermissive"; env.NIX_CFLAGS_COMPILE = "-fpermissive";
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
libsForQt5.wrapQtAppsHook qt6.wrapQtAppsHook
]; ];
buildInputs = [ buildInputs = [
libGL libGL
libGLU libGLU
] ]
++ (with libsForQt5; [ ++ (with qt6; [
qtbase qtbase
qt5compat
]); ]);
# note: we should be able to unvendor a few libs (ftgl, quazip, qwt) but they aren't detected properly # note: we should be able to unvendor a few libs (ftgl, quazip, qwt) but they aren't detected properly
cmakeFlags = [
"-DWORKBENCH_USE_QT6=TRUE"
"-DWORKBENCH_USE_QT5=FALSE"
];
meta = { meta = {
description = "Visualization and discovery tool used to map neuroimaging data"; description = "Visualization and discovery tool used to map neuroimaging data";
homepage = "https://www.humanconnectome.org/software/connectome-workbench"; homepage = "https://www.humanconnectome.org/software/connectome-workbench";