diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-03-23 02:55:06 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-03-23 02:56:30 +0000 |
| commit | 2ba605d00d691e4f7e8673a5f1f08b802f0cd5c4 (patch) | |
| tree | 6b1bb94a52d480ecadea6af32fddb1c9995382b2 | |
| parent | Format pkgs/development/libraries/boost/generic.nix (diff) | |
| download | nixpkgs-origin/backport-163216-to-release-21.11.tar.gz | |
Update pkgs/development/libraries/boost/generic.nixorigin/backport-163216-to-release-21.11
(cherry picked from commit 45adfd577c2fd36e0723968e9e9a448326f2698a)
| -rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 58d6e11aaf19..7439c208b3c6 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -129,10 +129,10 @@ stdenv.mkDerivation { # 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; - }) + 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; |