diff options
| author | Rasmus Rendal <rasmus@rend.al> | 2020-10-11 10:01:45 +0200 |
|---|---|---|
| committer | Rasmus Rendal <rasmus@rend.al> | 2020-10-11 10:26:47 +0200 |
| commit | 35e296f5e55a85a815ae22fb81259edb3a2d28d1 (patch) | |
| tree | 36afc7daea6859427815612846b6c4cf2b1131b7 /pkgs/development/libraries/boost | |
| parent | e929c3dde2ad14f6f3cec37bb1a619fe940477e9 (diff) | |
| download | nixpkgs-35e296f5e55a85a815ae22fb81259edb3a2d28d1.tar nixpkgs-35e296f5e55a85a815ae22fb81259edb3a2d28d1.tar.gz nixpkgs-35e296f5e55a85a815ae22fb81259edb3a2d28d1.tar.bz2 nixpkgs-35e296f5e55a85a815ae22fb81259edb3a2d28d1.tar.lz nixpkgs-35e296f5e55a85a815ae22fb81259edb3a2d28d1.tar.xz nixpkgs-35e296f5e55a85a815ae22fb81259edb3a2d28d1.tar.zst nixpkgs-35e296f5e55a85a815ae22fb81259edb3a2d28d1.zip | |
boost173: init at 1.73.0
Diffstat (limited to 'pkgs/development/libraries/boost')
| -rw-r--r-- | pkgs/development/libraries/boost/1.73.nix | 16 | ||||
| -rw-r--r-- | pkgs/development/libraries/boost/cmake-paths-173.patch | 22 | ||||
| -rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 3 |
3 files changed, 40 insertions, 1 deletions
diff --git a/pkgs/development/libraries/boost/1.73.nix b/pkgs/development/libraries/boost/1.73.nix new file mode 100644 index 00000000000..99a5486f197 --- /dev/null +++ b/pkgs/development/libraries/boost/1.73.nix @@ -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"; + }; +}) + diff --git a/pkgs/development/libraries/boost/cmake-paths-173.patch b/pkgs/development/libraries/boost/cmake-paths-173.patch new file mode 100644 index 00000000000..7b88da0e42a --- /dev/null +++ b/pkgs/development/libraries/boost/cmake-paths-173.patch @@ -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 ; + } + diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 6d1c20f323d..8295be238fc 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -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/"; |