diff options
| author | Will Dietz <w@wdtz.org> | 2022-04-14 19:37:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-14 19:37:20 -0500 |
| commit | dde5b0ca7a1e6a4fd46ead57a0a4b74b68e8255b (patch) | |
| tree | dfc3d2bc34817a9b16ca83465c6331ab1884d824 /pkgs/development/libraries/science | |
| parent | ccb965342711fc2c7dfb05519a80dfe00d995c25 (diff) | |
python3Packages.fenics: fix build, pin to older boost (#166728)
* python3Packages.fenics: fix build, pin to older boost Looking at upstream, there are various issues with newer boost. (At least some of them have been since fixed) For now, fix the build by using a version of boost that works with the current version. Error here was complaining about `std::min_element`, which is no longer available, apparently, due to newer boost no longer (transitively) including <algorithm>. This was added in C++17, so I'm not sure the cmake flag specifying dolfin built with C++11 makes sense or is used. Leaving for now :). * nixos/tests/fenics: fix name of machine/node in script Still fails for now. * python3Packages.fenics: fix accidentally changed strings in subst Looks like in migration to pkg-config this was erroneously changed from `pkgconfig` (python package, and source string) to `pkg-config` (nix package name, tool name). (see 9bb3fccb5b55326cb3c2c507464a8a28d44d1730) Fixes the NixOS test.
Diffstat (limited to 'pkgs/development/libraries/science')
| -rw-r--r-- | pkgs/development/libraries/science/math/fenics/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/pkgs/development/libraries/science/math/fenics/default.nix index 2690d544c2c8b..9ca4d6314c1ea 100644 --- a/pkgs/development/libraries/science/math/fenics/default.nix +++ b/pkgs/development/libraries/science/math/fenics/default.nix @@ -243,8 +243,8 @@ let export CMAKE_PREFIX_PATH=${pybind11}/share/cmake/pybind11:$CMAKE_PREFIX_PATH substituteInPlace setup.py --replace "pybind11==2.2.4" "pybind11" substituteInPlace dolfin/jit/jit.py \ - --replace 'pkg-config.exists("dolfin")' 'pkg-config.exists("${dolfin}/lib/pkgconfig/dolfin.pc")' \ - --replace 'pkg-config.parse("dolfin")' 'pkg-config.parse("${dolfin}/lib/pkgconfig/dolfin.pc")' + --replace 'pkgconfig.exists("dolfin")' 'pkgconfig.exists("${dolfin}/lib/pkgconfig/dolfin.pc")' \ + --replace 'pkgconfig.parse("dolfin")' 'pkgconfig.parse("${dolfin}/lib/pkgconfig/dolfin.pc")' ''; buildInputs = [ dolfin |