diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-01-31 20:00:30 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-01-31 20:00:30 +0000 |
| commit | 2183d3167eda2c3bdaafffb123512873fde46a96 (patch) | |
| tree | 1c115a5c0607a3281c1e1c47fc4fd010c70b1610 /pkgs | |
| parent | 442a74bdf896db0ddcb750c57e9d58eb17d06769 (diff) | |
| parent | 69466ba96a5fbd78bff80b01582649400d4da488 (diff) | |
| download | nixpkgs-2183d3167eda2c3bdaafffb123512873fde46a96.tar nixpkgs-2183d3167eda2c3bdaafffb123512873fde46a96.tar.gz nixpkgs-2183d3167eda2c3bdaafffb123512873fde46a96.tar.bz2 nixpkgs-2183d3167eda2c3bdaafffb123512873fde46a96.tar.lz nixpkgs-2183d3167eda2c3bdaafffb123512873fde46a96.tar.xz nixpkgs-2183d3167eda2c3bdaafffb123512873fde46a96.tar.zst nixpkgs-2183d3167eda2c3bdaafffb123512873fde46a96.zip | |
Merge commit 'refs/pull/53622/head' of https://github.com/NixOS/nixpkgs into staging
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/boehm-gc/default.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index cdf72830797..399581400a0 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -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; |