diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index 25e5a61f2722..917de745d277 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { " ''; - postInstall = '' + postInstall = stdenv.lib.optionalString stdenv.isLinux '' substituteInPlace "$out/share/applications/communi.desktop" \ --replace "/usr/bin" "$out/bin" ''; 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";