diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-05-21 14:22:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-21 14:22:11 +0100 |
| commit | 7796075209a3d0814d8dc1d15498fe6451cd2d44 (patch) | |
| tree | de7717e76720d6ec303d3acb85302ac8cc98fb94 | |
| parent | 7610c10143ad202a3024c0735fec145c48a7d108 (diff) | |
| parent | 99d56c542e4914b3f6dd06deeb14e0495a2abd31 (diff) | |
| download | nixlib-7796075209a3d0814d8dc1d15498fe6451cd2d44.tar nixlib-7796075209a3d0814d8dc1d15498fe6451cd2d44.tar.gz nixlib-7796075209a3d0814d8dc1d15498fe6451cd2d44.tar.bz2 nixlib-7796075209a3d0814d8dc1d15498fe6451cd2d44.tar.lz nixlib-7796075209a3d0814d8dc1d15498fe6451cd2d44.tar.xz nixlib-7796075209a3d0814d8dc1d15498fe6451cd2d44.tar.zst nixlib-7796075209a3d0814d8dc1d15498fe6451cd2d44.zip | |
Merge pull request #37253 from LnL7/darwin-communi
communi: fix darwin build
| -rw-r--r-- | pkgs/applications/networking/irc/communi/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/libcommuni/default.nix | 8 |
2 files changed, 7 insertions, 3 deletions
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"; |