diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-20 09:38:45 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-20 09:38:45 +0100 |
| commit | 32767d139f28fd3c00d687c04ec406258f7341e7 (patch) | |
| tree | b049aa5d798a9fa2555882c788592a0640928ba2 /pkgs/development/libraries/boehm-gc | |
| parent | 28d983fe25bcf853dfd38663f333d4c522f613cc (diff) | |
| parent | e20188f181ca51882984daaee237a95f2fc5e7c9 (diff) | |
| download | nixpkgs-32767d139f28fd3c00d687c04ec406258f7341e7.tar nixpkgs-32767d139f28fd3c00d687c04ec406258f7341e7.tar.gz nixpkgs-32767d139f28fd3c00d687c04ec406258f7341e7.tar.bz2 nixpkgs-32767d139f28fd3c00d687c04ec406258f7341e7.tar.lz nixpkgs-32767d139f28fd3c00d687c04ec406258f7341e7.tar.xz nixpkgs-32767d139f28fd3c00d687c04ec406258f7341e7.tar.zst nixpkgs-32767d139f28fd3c00d687c04ec406258f7341e7.zip | |
Merge branch 'staging-next'
This round is without the systemd CVE, as we don't have binaries for that yet. BTW, I just ignore darwin binaries these days, as I'd have to wait for weeks for them.
Diffstat (limited to 'pkgs/development/libraries/boehm-gc')
| -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 74cc80bf082..1a2c75ecf91 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; |