mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-20 19:16:11 +00:00
Merge pull request #236071 from wegank/monotone-boost
monotone: unpin boost170
This commit is contained in:
commit
0f2e0e650f
@ -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 ";
|
||||
|
@ -32652,7 +32652,6 @@ with pkgs;
|
||||
|
||||
monotone = callPackage ../applications/version-management/monotone {
|
||||
lua = lua5;
|
||||
boost = boost170;
|
||||
};
|
||||
|
||||
monotoneViz = callPackage ../applications/version-management/monotone-viz {
|
||||
|
Loading…
Reference in New Issue
Block a user