From 083772d7eeb0920191fe6d005d5c0e66dcbb2ffc Mon Sep 17 00:00:00 2001 From: "Frederick F. Kautz IV" Date: Wed, 1 Jul 2020 18:05:23 -0700 Subject: [PATCH 1/2] purple-matrix: set c compiler to cc, fixes build on osx Signed-off-by: Frederick F. Kautz IV --- .../instant-messengers/pidgin-plugins/purple-matrix/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 999235314fe..8fc01c111d2 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -4,6 +4,8 @@ stdenv.mkDerivation rec { pname = "purple-matrix-unstable"; version = "2019-06-06"; + buildFlags = [ "CC=cc" ]; + src = fetchFromGitHub { owner = "matrix-org"; repo = "purple-matrix"; From fc8489880825f4d6e74693c8fb598df2d27c84da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 20 Jul 2020 14:50:01 +0200 Subject: [PATCH 2/2] fixup! purple-matrix: set c compiler to cc, fixes build on osx --- .../pidgin-plugins/purple-matrix/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 8fc01c111d2..4ded2ce1d0b 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -4,8 +4,6 @@ stdenv.mkDerivation rec { pname = "purple-matrix-unstable"; version = "2019-06-06"; - buildFlags = [ "CC=cc" ]; - src = fetchFromGitHub { owner = "matrix-org"; repo = "purple-matrix"; @@ -28,10 +26,13 @@ stdenv.mkDerivation rec { "DATA_ROOT_DIR_PURPLE=${placeholder "out"}/share" ]; + buildFlags = [ "CC=cc" ]; # fix build on darwin + meta = with stdenv.lib; { homepage = "https://github.com/matrix-org/purple-matrix"; description = "Matrix support for Pidgin / libpurple"; license = licenses.gpl2; + platforms = platforms.unix; maintainers = with maintainers; [ symphorien ]; }; }