JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #37253 from LnL7/darwin-communi

Browse Source 
communi: fix darwin build
This commit is contained in:
Jörg Thalheim 2018-05-21 14:22:11 +01:00 committed by GitHub
commit 7796075209
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/irc/communi/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
" "
''; '';
postInstall = '' postInstall = stdenv.lib.optionalString stdenv.isLinux ''
substituteInPlace "$out/share/applications/communi.desktop" \ substituteInPlace "$out/share/applications/communi.desktop" \
--replace "/usr/bin" "$out/bin" --replace "/usr/bin" "$out/bin"
''; '';

8
pkgs/development/libraries/libcommuni/default.nix
View File

@ -19,12 +19,16 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
dontUseQmakeConfigure = true; dontUseQmakeConfigure = true;
configureFlags = "-config release"; configureFlags = [ "-config" "release" ];
preConfigure = '' preConfigure = ''
sed -i -e 's|/bin/pwd|pwd|g' configure 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. # Hack to avoid TMPDIR in RPATHs.
preFixup = "rm -rf lib"; preFixup = "rm -rf lib";