Merge pull request #5091 from wkennington/master.boost
This is close enough that any remaining incompatibilities can be sorted out.
This commit is contained in:
commit
f3d515e6dd
@ -842,7 +842,9 @@ let
|
||||
|
||||
cksfv = callPackage ../tools/networking/cksfv { };
|
||||
|
||||
clementine = callPackage ../applications/audio/clementine { };
|
||||
clementine = callPackage ../applications/audio/clementine {
|
||||
boost = boost156;
|
||||
};
|
||||
|
||||
ciopfs = callPackage ../tools/filesystems/ciopfs { };
|
||||
|
||||
@ -4883,7 +4885,7 @@ let
|
||||
boost155 = callPackage ../development/libraries/boost/1.55.nix { };
|
||||
boost156 = callPackage ../development/libraries/boost/1.56.nix { };
|
||||
boost157 = callPackage ../development/libraries/boost/1.57.nix { };
|
||||
boost = boost156;
|
||||
boost = boost157;
|
||||
|
||||
boost_process = callPackage ../development/libraries/boost-process { };
|
||||
|
||||
@ -7686,6 +7688,7 @@ let
|
||||
mariadb = callPackage ../servers/sql/mariadb {};
|
||||
|
||||
mongodb = callPackage ../servers/nosql/mongodb {
|
||||
boost = boost156;
|
||||
sasl = cyrus_sasl;
|
||||
};
|
||||
|
||||
@ -9648,6 +9651,7 @@ let
|
||||
};
|
||||
|
||||
freecad = callPackage ../applications/graphics/freecad {
|
||||
boost = boost156;
|
||||
opencascade = opencascade_6_5;
|
||||
inherit (pythonPackages) matplotlib pycollada;
|
||||
};
|
||||
@ -10511,6 +10515,7 @@ let
|
||||
pythonmagick = callPackage ../applications/graphics/PythonMagick { };
|
||||
|
||||
qbittorrent = callPackage ../applications/networking/p2p/qbittorrent {
|
||||
boost = boost156;
|
||||
libtorrentRasterbar = libtorrentRasterbar_0_16;
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user