From 33c5f3cec7456a07ecfdab1a1fb05919701e1346 Mon Sep 17 00:00:00 2001 From: Benjamin Esham Date: Mon, 1 Jul 2019 13:13:22 -0400 Subject: [PATCH 1/3] olm: allow building on Darwin --- pkgs/development/libraries/olm/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index 4749efb5f006..49daff30e7b5 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { description = "Implements double cryptographic ratchet and Megolm ratchet"; license = stdenv.lib.licenses.asl20; homepage = https://matrix.org/git/olm/about; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; darwin ++ linux; }; src = fetchurl { @@ -22,5 +22,7 @@ stdenv.mkDerivation rec { # requires optimisation but memory operations are compiled with -O0 hardeningDisable = ["fortify"]; + makeFlags = if stdenv.cc.isClang then [ "CC=cc" ] else null; + installFlags = "PREFIX=$(out)"; } From 01f10d01632092b1dcea8dae643b93cea87a38a1 Mon Sep 17 00:00:00 2001 From: Benjamin Esham Date: Mon, 1 Jul 2019 13:13:41 -0400 Subject: [PATCH 2/3] weechat-matrix-bridge: mark package as broken as Darwin All of the dependencies of this package are now available on Darwin, but the package itself still fails to build on that platform. --- .../irc/weechat/scripts/weechat-matrix-bridge/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix index 137a32f9364f..233fe418df3a 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix @@ -42,5 +42,9 @@ stdenv.mkDerivation { maintainers = with maintainers; [ ma27 ]; license = licenses.mit; # see https://github.com/torhve/weechat-matrix-protocol-script/blob/0052e7275ae149dc5241226391c9b1889ecc3c6b/matrix.lua#L53 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; }; } From 39aac077235f2000d4ccc4effcd8140a9901795e Mon Sep 17 00:00:00 2001 From: Benjamin Esham Date: Mon, 1 Jul 2019 13:14:36 -0400 Subject: [PATCH 3/3] mtxclient: mark package as broken on Darwin All of the dependencies of this package are now available on Darwin, but the package itself still fails to build on that platform. --- pkgs/development/libraries/mtxclient/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index ee8c8f101a24..ef8525cf54d7 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -27,5 +27,9 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ fpletz ]; 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; }; }