Merge pull request #236071 from wegank/monotone-boost

monotone: unpin boost170
This commit is contained in:
Weijia Wang 2023-06-05 17:08:51 +03:00 committed by GitHub
commit 0f2e0e650f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions

View File

@ -44,6 +44,11 @@ stdenv.mkDerivation rec {
postPatch = ''
sed -e 's@/usr/bin/less@${less}/bin/less@' -i src/unix/terminal.cc
'' + lib.optionalString (lib.versionAtLeast boost.version "1.73") ''
find . -type f -exec sed -i \
-e 's/ E(/ internal_E(/g' \
-e 's/{E(/{internal_E(/g' \
{} +
'';
CXXFLAGS=" --std=c++11 ";

View File

@ -32652,7 +32652,6 @@ with pkgs;
monotone = callPackage ../applications/version-management/monotone {
lua = lua5;
boost = boost170;
};
monotoneViz = callPackage ../applications/version-management/monotone-viz {