about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2018-12-27 17:52:04 +0000
committerOrivej Desh <orivej@gmx.fr>2018-12-27 17:53:29 +0000
commit830599debecac99f0215029c922879af84be386e (patch)
tree9c6c7f70dfb584fa6b261ffb72d982cdafd3d6af
parent992fc1ae5434458bbbc37f7c7a64231ead940ccf (diff)
downloadnixlib-830599debecac99f0215029c922879af84be386e.tar
nixlib-830599debecac99f0215029c922879af84be386e.tar.gz
nixlib-830599debecac99f0215029c922879af84be386e.tar.bz2
nixlib-830599debecac99f0215029c922879af84be386e.tar.lz
nixlib-830599debecac99f0215029c922879af84be386e.tar.xz
nixlib-830599debecac99f0215029c922879af84be386e.tar.zst
nixlib-830599debecac99f0215029c922879af84be386e.zip
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
-rw-r--r--pkgs/tools/package-management/nix/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index ea03570bb3e5..e6beee0b38ce 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 =