From e5389528838746c1b8cf634ac1a656b09d5f88fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Fri, 22 Nov 2019 21:24:58 +0100 Subject: [PATCH] boost170: Fix cmake files The *-config.cmake files before this commit incorrectly assumed that their location will be in $out/lib, thus leading to incorrect relative paths. Fixes: #63104 --- pkgs/development/libraries/boost/generic.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index f7bd189022f84..d0eb89cea3796 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -71,6 +71,8 @@ let "link=${link}" "-sEXPAT_INCLUDE=${expat.dev}/include" "-sEXPAT_LIBPATH=${expat.out}/lib" + ] ++ optionals (versionAtLeast version "1.70") [ + "--cmakedir=$dev/lib/cmake" # TODO: make this unconditional ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [