Merge pull request #236249 from wegank/ciftilib-boost

ciftilib: unpin boost16x
This commit is contained in:
Weijia Wang 2023-06-06 14:16:24 +03:00 committed by GitHub
commit ac6d8999f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions

View File

@ -24,13 +24,16 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;'big|datatype-md5'" ];
# error: no member named 'file_string' in 'boost::filesystem::path'
env.NIX_CFLAGS_COMPILE = "-UCIFTILIB_BOOST_NO_FSV3";
doCheck = true;
meta = with lib; {
homepage = "https://github.com/Washington-University/CiftiLib";
description = "Library for reading and writing CIFTI files";
maintainers = with maintainers; [ bcdarwin ];
platforms = platforms.linux;
platforms = platforms.unix;
license = licenses.bsd2;
};
}

View File

@ -37713,9 +37713,7 @@ with pkgs;
inherit (llvmPackages) openmp;
};
ciftilib = callPackage ../development/libraries/science/biology/ciftilib {
boost = boost16x;
};
ciftilib = callPackage ../development/libraries/science/biology/ciftilib { };
cmtk = callPackage ../applications/science/biology/cmtk { };