BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #100215 from RasmusRendal/boost

Browse source 
boost173 and boost174: Init both
This commit is contained in:
Peter Simons 2020-10-19 09:44:07 +02:00 committed by GitHub
commit e0f62babfc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 58 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/development/libraries/boost/1.73.nix Normal file
View 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";
};
})

15
pkgs/development/libraries/boost/1.74.nix Normal file
View file

@ -0,0 +1,15 @@
{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "1.74.0";
src = fetchurl {
urls = [
"mirror://sourceforge/boost/boost_1_74_0.tar.bz2"
"https://dl.bintray.com/boostorg/release/1.74.0/source/boost_1_74_0.tar.bz2"
];
# SHA256 from http://www.boost.org/users/history/version_1_74_0.html
sha256 = "83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1";
};
})

22
pkgs/development/libraries/boost/cmake-paths-173.patch Normal file
View 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 ;
}

3
pkgs/development/libraries/boost/generic.nix
View file

@ -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/";

4
pkgs/top-level/all-packages.nix
View file

@ -12043,7 +12043,9 @@ 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 { };
boost174 = callPackage ../development/libraries/boost/1.74.nix { };
boost17x = boost174;
boost = boost16x;
boost_process = callPackage ../development/libraries/boost-process { };