From a97ce4912be9f02bab63c6ba927578119ab750f8 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 6 Jun 2023 13:15:00 +0300 Subject: [PATCH] ciftilib: unpin boost16x --- .../libraries/science/biology/ciftilib/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/science/biology/ciftilib/default.nix b/pkgs/development/libraries/science/biology/ciftilib/default.nix index 797607ed8f54..85b0b1c8a0e5 100644 --- a/pkgs/development/libraries/science/biology/ciftilib/default.nix +++ b/pkgs/development/libraries/science/biology/ciftilib/default.nix @@ -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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb09ae7e5de9..c87862e69d5e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37711,9 +37711,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 { };