From 421ac6983090d2f153e1e6e480f050cbbadbe15c Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 17 Mar 2018 14:40:31 +0100 Subject: [PATCH] libcommuni: fix darwin build /cc ZHF #36454 --- pkgs/development/libraries/libcommuni/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix index 6192266bd4aa..0788236b6017 100644 --- a/pkgs/development/libraries/libcommuni/default.nix +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -19,12 +19,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; dontUseQmakeConfigure = true; - configureFlags = "-config release"; + configureFlags = [ "-config" "release" ]; + preConfigure = '' sed -i -e 's|/bin/pwd|pwd|g' configure ''; - doCheck = true; + # The tests fail on darwin because of install_name if they run + # before the frameworks are installed. + doInstallCheck = true; + installCheckTarget = "check"; # Hack to avoid TMPDIR in RPATHs. preFixup = "rm -rf lib";