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

Merge pull request #63958 from bdesham/olm-on-darwin

Browse Source 
olm: Allow building on Darwin
This commit is contained in:
Wael Nasreddine 2019-07-01 10:45:43 -07:00 committed by GitHub
commit 863bc6ed94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
View File

@ -42,5 +42,9 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ ma27 ]; maintainers = with maintainers; [ ma27 ];
license = licenses.mit; # see https://github.com/torhve/weechat-matrix-protocol-script/blob/0052e7275ae149dc5241226391c9b1889ecc3c6b/matrix.lua#L53 license = licenses.mit; # see https://github.com/torhve/weechat-matrix-protocol-script/blob/0052e7275ae149dc5241226391c9b1889ecc3c6b/matrix.lua#L53
platforms = platforms.unix; platforms = platforms.unix;
# As of 2019-06-30, all of the dependencies are available on macOS but the
# package itself does not build.
broken = stdenv.isDarwin;
}; };
} }

4
pkgs/development/libraries/mtxclient/default.nix
View File

@ -27,5 +27,9 @@ stdenv.mkDerivation rec {
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ fpletz ]; maintainers = with maintainers; [ fpletz ];
platforms = platforms.unix; platforms = platforms.unix;
# As of 2019-06-30, all of the dependencies are available on macOS but the
# package itself does not build.
broken = stdenv.isDarwin;
}; };
} }

4
pkgs/development/libraries/olm/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
description = "Implements double cryptographic ratchet and Megolm ratchet"; description = "Implements double cryptographic ratchet and Megolm ratchet";
license = stdenv.lib.licenses.asl20; license = stdenv.lib.licenses.asl20;
homepage = https://matrix.org/git/olm/about; homepage = https://matrix.org/git/olm/about;
platforms = stdenv.lib.platforms.linux; platforms = with stdenv.lib.platforms; darwin ++ linux;
}; };
src = fetchurl { src = fetchurl {
@ -22,5 +22,7 @@ stdenv.mkDerivation rec {
# requires optimisation but memory operations are compiled with -O0 # requires optimisation but memory operations are compiled with -O0
hardeningDisable = ["fortify"]; hardeningDisable = ["fortify"];
makeFlags = if stdenv.cc.isClang then [ "CC=cc" ] else null;
installFlags = "PREFIX=$(out)"; installFlags = "PREFIX=$(out)";
} }