From 0c2d8f11c01457cc65b6390dac376f303d365dfe Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 5 Jun 2023 14:07:21 +0300 Subject: [PATCH] monotone: unpin boost170 --- pkgs/applications/version-management/monotone/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index 866146e1d8ff..2db433b3f8c4 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -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 "; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1b530a640a1..77f612606289 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32656,7 +32656,6 @@ with pkgs; monotone = callPackage ../applications/version-management/monotone { lua = lua5; - boost = boost170; }; monotoneViz = callPackage ../applications/version-management/monotone-viz {