From 094f290f35c2c5c60f11e4deb9fa756bf922eb5e Mon Sep 17 00:00:00 2001 From: Domen Kožar Date: Sun, 29 Sep 2019 11:18:02 +0200 Subject: bohem-gc: fix static build --- pkgs/development/libraries/boehm-gc/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'pkgs/development/libraries/boehm-gc') diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index b347a7a0f2f7d..bc8b7a8c76004 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -15,18 +15,13 @@ stdenv.mkDerivation rec { }; outputs = [ "out" "dev" "doc" ]; - separateDebugInfo = stdenv.isLinux; + separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") '' 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"; - }) ] ++ - # https://github.com/ivmai/bdwgc/pull/208 + patches = # https://github.com/ivmai/bdwgc/pull/208 lib.optional stdenv.hostPlatform.isRiscV ./riscv.patch; configureFlags = -- cgit 1.4.1