diff options
| author | Markus Wamser <wamserma@users.noreply.github.com> | 2022-03-23 03:51:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-23 03:51:12 +0100 |
| commit | 713648a19b149484625fb88ab97c51b55de1cb93 (patch) | |
| tree | a5c117e7b68abfbb0eb2f945d2b048dad22dd227 /pkgs/development/libraries/boost | |
| parent | e67d3a3e141cddf2b46567cefa9f33cb86d78d18 (diff) | |
| download | nixpkgs-713648a19b149484625fb88ab97c51b55de1cb93.tar nixpkgs-713648a19b149484625fb88ab97c51b55de1cb93.tar.gz nixpkgs-713648a19b149484625fb88ab97c51b55de1cb93.tar.bz2 nixpkgs-713648a19b149484625fb88ab97c51b55de1cb93.tar.lz nixpkgs-713648a19b149484625fb88ab97c51b55de1cb93.tar.xz nixpkgs-713648a19b149484625fb88ab97c51b55de1cb93.tar.zst nixpkgs-713648a19b149484625fb88ab97c51b55de1cb93.zip | |
boost: unbreak build for 1.65 and 1.66 (#163216)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Diffstat (limited to 'pkgs/development/libraries/boost')
| -rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index bad87fba8c6..8084065ce06 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -126,6 +126,13 @@ stdenv.mkDerivation { stripLen = 1; extraPrefix = "libs/context/"; }) + # Fix compiler warning with GCC >= 8; TODO: patch may apply to older versions + ++ optional (versionAtLeast version "1.65" && versionOlder version "1.67") + (fetchpatch { + url = "https://github.com/boostorg/mpl/commit/f48fd09d021db9a28bd7b8452c175897e1af4485.patch"; + sha256 = "15d2a636hhsb1xdyp44x25dyqfcaws997vnp9kl1mhzvxjzz7hb0"; + stripLen = 1; + }) ++ optional (and (versionAtLeast version "1.70") (!versionAtLeast version "1.73")) ./cmake-paths.patch ++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch ++ optional (version == "1.77.0") (fetchpatch { |