From 830599debecac99f0215029c922879af84be386e Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 27 Dec 2018 17:52:04 +0000 Subject: [PATCH] nix1: fix build with boehmgc 7.6.8 It needs -lgc and -lgccpp, but boehmgc pkgconfig file specifies only -lgc. Broken in https://hydra.nixos.org/build/82223544 --- pkgs/tools/package-management/nix/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index ea03570bb3e..e6beee0b38c 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -51,10 +51,11 @@ let preConfigure = # Copy libboost_context so we don't get all of Boost in our closure. # https://github.com/NixOS/nixpkgs/issues/45462 - lib.optionalString is20 - '' + if is20 then '' mkdir -p $out/lib cp ${boost}/lib/libboost_context* $out/lib + '' else '' + configureFlagsArray+=(BDW_GC_LIBS="-lgc -lgccpp") ''; configureFlags =