Merge commit 'refs/pull/53622/head' of https://github.com/NixOS/nixpkgs into staging

This commit is contained in:
Alyssa Ross 2019-01-31 20:00:30 +00:00
commit 2183d3167e
No known key found for this signature in database
GPG Key ID: C4844408C0657052

View File

@ -24,11 +24,7 @@ stdenv.mkDerivation rec {
export NIX_CFLAGS_COMPILE+="-D_GNU_SOURCE -DUSE_MMAP -DHAVE_DL_ITERATE_PHDR"
'';
patches = [ (fetchpatch {
name = "boehm-gc-7.6.0-sys_select.patch";
url = "https://gitweb.gentoo.org/proj/musl.git/plain/dev-libs/boehm-gc/files/boehm-gc-7.6.0-sys_select.patch?id=85b6a600996bdd71162b357e9ba93d8559342432";
sha256 = "1gydwlklvci30f5dpp5ccw2p2qpph5y41r55wx9idamjlq66fbb3";
}) ] ++
patches =
# https://github.com/ivmai/bdwgc/pull/208
lib.optional stdenv.hostPlatform.isRiscV ./riscv.patch;