lol
fork

Configure Feed

Select the types of activity you want to include in your feed.

boost159: fix build on aarch64-darwin

authored by

Andrew Childs and committed by
Artturin
de396a3c bdd431d5

+21 -1
+14 -1
pkgs/development/libraries/boost/1.59.nix
··· 1 - { callPackage, fetchurl, ... } @ args: 1 + { callPackage, fetchurl, fetchpatch, ... } @ args: 2 2 3 3 callPackage ./generic.nix (args // rec { 4 4 version = "1.59.0"; 5 + 6 + boostBuildPatches = [ 7 + # Fixes a segfault on aarch64-darwin from an implicitly defined varargs function. 8 + # https://github.com/boostorg/build/pull/238 9 + (fetchpatch { 10 + url = "https://github.com/boostorg/build/commit/48e9017139dd94446633480661e5447c7e0d8b1b.diff"; 11 + excludes = [ 12 + # Doesn't apply, isn't critical. 13 + "src/engine/filesys.h" 14 + ]; 15 + sha256 = "sha256-/HLOJKBcGqcK9yBYKSRCSMmTNhCH3sSpK1s3OzkIqx8"; 16 + }) 17 + ]; 5 18 6 19 src = fetchurl { 7 20 url = "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2";
+5
pkgs/development/libraries/boost/generic.nix
··· 15 15 , enableNumpy ? false 16 16 , taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic)) 17 17 , patches ? [] 18 + , boostBuildPatches ? [] 18 19 , useMpi ? false 19 20 , mpi 20 21 , extraB2Args ? [] ··· 168 169 stdenv.hostPlatform.isMips64n32 || 169 170 # the patch above does not apply cleanly to pre-1.65 boost 170 171 (stdenv.hostPlatform.isMips64n64 && (versionOlder version "1.65")); 172 + }; 173 + 174 + passthru = { 175 + inherit boostBuildPatches; 171 176 }; 172 177 173 178 preConfigure = optionalString useMpi ''
+2
pkgs/development/tools/boost-build/default.nix
··· 33 33 sourceRoot="$sourceRoot/tools/build" 34 34 ''; 35 35 36 + patches = useBoost.boostBuildPatches or []; 37 + 36 38 # Upstream defaults to gcc on darwin, but we use clang. 37 39 postPatch = '' 38 40 substituteInPlace src/build-system.jam \