diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-20 00:05:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-20 00:05:13 +0000 |
| commit | aac580f88f705cd65d47672a8bc1fac3482f9837 (patch) | |
| tree | 78eca36e986e366284af6152ab80bd307806c9d4 /pkgs/development/libraries/boost | |
| parent | da85286b28f0be9029a514fcba29ee13d9762317 (diff) | |
| parent | ba90bab628277d977d3a381e91d4ce0af4ea4f91 (diff) | |
| download | nixpkgs-aac580f88f705cd65d47672a8bc1fac3482f9837.tar nixpkgs-aac580f88f705cd65d47672a8bc1fac3482f9837.tar.gz nixpkgs-aac580f88f705cd65d47672a8bc1fac3482f9837.tar.bz2 nixpkgs-aac580f88f705cd65d47672a8bc1fac3482f9837.tar.lz nixpkgs-aac580f88f705cd65d47672a8bc1fac3482f9837.tar.xz nixpkgs-aac580f88f705cd65d47672a8bc1fac3482f9837.tar.zst nixpkgs-aac580f88f705cd65d47672a8bc1fac3482f9837.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/boost')
| -rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 18f3fc2bf9c..b6ab49e4b4d 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -81,7 +81,9 @@ let "-sEXPAT_LIBPATH=${expat.out}/lib" # TODO: make this unconditional - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform || + # required on mips; see 61d9f201baeef4c4bb91ad8a8f5f89b747e0dfe4 + (stdenv.hostPlatform.isMips && versionAtLeast version "1.79")) [ "address-model=${toString stdenv.hostPlatform.parsed.cpu.bits}" "architecture=${if stdenv.hostPlatform.isMips64 then if versionOlder version "1.78" then "mips1" else "mips" |