diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-06-05 14:07:21 +0300 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-06-05 14:07:21 +0300 |
| commit | 0c2d8f11c01457cc65b6390dac376f303d365dfe (patch) | |
| tree | 2ceb1bc3c83208007ee58a59b4681c0c9c3020bd | |
| parent | 31cd1b4afbaf0b1e81272ee9c31d1ab606503aed (diff) | |
| download | nixpkgs-0c2d8f11c01457cc65b6390dac376f303d365dfe.tar nixpkgs-0c2d8f11c01457cc65b6390dac376f303d365dfe.tar.gz nixpkgs-0c2d8f11c01457cc65b6390dac376f303d365dfe.tar.bz2 nixpkgs-0c2d8f11c01457cc65b6390dac376f303d365dfe.tar.lz nixpkgs-0c2d8f11c01457cc65b6390dac376f303d365dfe.tar.xz nixpkgs-0c2d8f11c01457cc65b6390dac376f303d365dfe.tar.zst nixpkgs-0c2d8f11c01457cc65b6390dac376f303d365dfe.zip | |
monotone: unpin boost170
| -rw-r--r-- | pkgs/applications/version-management/monotone/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index 866146e1d8f..2db433b3f8c 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 e1b530a640a..77f61260628 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 { |