Unverified Commit ac6d8999 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #236249 from wegank/ciftilib-boost 

ciftilib: unpin boost16x
parents 75591fd5 a97ce491

pkgs/development/libraries/science/biology/ciftilib/default.nix

+4 −1
Original line number Diff line number Diff line
@@ -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;

  };

}

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -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 { };