boost173: init at 1.73.0
This commit is contained in:
parent
e929c3dde2
commit
35e296f5e5
16
pkgs/development/libraries/boost/1.73.nix
Normal file
16
pkgs/development/libraries/boost/1.73.nix
Normal file
@ -0,0 +1,16 @@
|
||||
{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "1.73.0";
|
||||
|
||||
src = fetchurl {
|
||||
#url = "mirror://sourceforge/boost/boost_1_73_0.tar.bz2";
|
||||
urls = [
|
||||
"mirror://sourceforge/boost/boost_1_73_0.tar.bz2"
|
||||
"https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.bz2"
|
||||
];
|
||||
# SHA256 from http://www.boost.org/users/history/version_1_73_0.html
|
||||
sha256 = "4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402";
|
||||
};
|
||||
})
|
||||
|
22
pkgs/development/libraries/boost/cmake-paths-173.patch
Normal file
22
pkgs/development/libraries/boost/cmake-paths-173.patch
Normal file
@ -0,0 +1,22 @@
|
||||
diff --git a/tools/boost_install/boost-install.jam b/tools/boost_install/boost-install.jam
|
||||
index 4238f921e..8fc1ea269 100644
|
||||
--- a/tools/boost_install/boost-install.jam
|
||||
+++ b/tools/boost_install/boost-install.jam
|
||||
@@ -649,7 +649,7 @@ rule generate-cmake-config- ( target : sources * : properties * )
|
||||
""
|
||||
"# Compute the include and library directories relative to this file."
|
||||
""
|
||||
- "get_filename_component(_BOOST_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" REALPATH)"
|
||||
+ "get_filename_component(_BOOST_REAL_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" REALPATH)"
|
||||
: true ;
|
||||
|
||||
if [ path.is-rooted $(cmakedir) ]
|
||||
@@ -668,6 +668,8 @@ rule generate-cmake-config- ( target : sources * : properties * )
|
||||
" unset(_BOOST_CMAKEDIR_ORIGINAL)"
|
||||
"endif()"
|
||||
""
|
||||
+ "# Assume that the installer actually did know where the libs were to be installed"
|
||||
+ "get_filename_component(_BOOST_CMAKEDIR \"$(cmakedir-native)\" REALPATH)"
|
||||
: true ;
|
||||
}
|
||||
|
@ -113,7 +113,8 @@ stdenv.mkDerivation {
|
||||
if version == "1.55.0"
|
||||
then ./darwin-1.55-no-system-python.patch
|
||||
else ./darwin-no-system-python.patch)
|
||||
++ optional (versionAtLeast version "1.70") ./cmake-paths.patch;
|
||||
++ optional (and (versionAtLeast version "1.70") (!versionAtLeast version "1.73")) ./cmake-paths.patch
|
||||
++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch;
|
||||
|
||||
meta = {
|
||||
homepage = "http://boost.org/";
|
||||
|
@ -11372,7 +11372,8 @@ in
|
||||
boost170 = callPackage ../development/libraries/boost/1.70.nix { };
|
||||
boost171 = callPackage ../development/libraries/boost/1.71.nix { };
|
||||
boost172 = callPackage ../development/libraries/boost/1.72.nix { };
|
||||
boost17x = boost172;
|
||||
boost173 = callPackage ../development/libraries/boost/1.73.nix { };
|
||||
boost17x = boost173;
|
||||
boost = boost16x;
|
||||
|
||||
boost_process = callPackage ../development/libraries/boost-process { };
|
||||
|
Loading…
Reference in New Issue
Block a user