From 33393449fdf6ceac32310e7f4d2011fb87985c7e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 17 Oct 2023 00:40:36 +0200 Subject: [PATCH 1/5] telepathy-gabble: add darwin support --- .../instant-messengers/telepathy/gabble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index a8b762ab7eab..ed2723c0435c 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - homepage = "https://telepathy.freedesktop.org/components/telepathy-gabble/"; description = "Jabber/XMPP connection manager for the Telepathy framework"; + homepage = "https://telepathy.freedesktop.org/components/telepathy-gabble/"; license = licenses.lgpl21Plus; - platforms = lib.platforms.gnu ++ lib.platforms.linux; + platforms = lib.platforms.unix; }; } From e7d7a4326f7e80697b45551c711d11085f27062d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 17 Oct 2023 00:40:42 +0200 Subject: [PATCH 2/5] telepathy-haze: add darwin support --- .../instant-messengers/telepathy/haze/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index 4b8d2f6104ab..36b38c585438 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, python3, glib, dbus-glib, pkg-config, libxslt }: +{ lib, stdenv, fetchurl, pidgin, telepathy-glib, python3, glib, dbus-glib, pkg-config, libxslt }: stdenv.mkDerivation rec { pname = "telepathy-haze"; @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { meta = { description = "A Telepathy connection manager based on libpurple"; - platforms = lib.platforms.gnu ++ lib.platforms.linux; # Random choice + homepage = "https://telepathy.freedesktop.org/components/telepathy-haze/"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } From 73072649ee8821afb3835d7f2d8e7463627bd694 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 17 Oct 2023 00:40:48 +0200 Subject: [PATCH 3/5] telepathy-idle: add darwin support --- .../networking/instant-messengers/telepathy/idle/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index 1a546ed1aef5..18908fbfb74f 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "IRC connection manager for the Telepathy framework"; - license = lib.licenses.lgpl21; - platforms = lib.platforms.gnu ++ lib.platforms.linux; + homepage = "https://telepathy.freedesktop.org/components/telepathy-idle/"; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.unix; }; } From 5eecf587ae4416bfb4cf7d6818a711d685ef359d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 17 Oct 2023 00:40:55 +0200 Subject: [PATCH 4/5] telepathy-logger: add darwin support --- .../instant-messengers/telepathy/logger/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index ac03ee20ff95..9a8e547b70eb 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, python3, pkg-config , dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus -, fetchpatch +, fetchpatch, darwin }: stdenv.mkDerivation rec { @@ -26,6 +26,9 @@ stdenv.mkDerivation rec { buildInputs = [ dbus-glib libxml2 sqlite telepathy-glib dbus + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.Foundation ]; configureFlags = [ "--enable-call" ]; @@ -39,8 +42,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Logger service for Telepathy framework"; homepage = "https://telepathy.freedesktop.org/components/telepathy-logger/"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ ]; - platforms = platforms.gnu ++ platforms.linux; # Arbitrary choice + platforms = platforms.unix; }; } From 1005b0828a8d3bff35bf4d1bc9c28c515e4fe20d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 17 Oct 2023 00:41:02 +0200 Subject: [PATCH 5/5] telepathy-mission-control: add darwin support --- .../telepathy/mission-control/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index 3bc59091afab..203954434607 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -6,6 +6,8 @@ , python3 , libxslt , makeWrapper +, autoreconfHook +, gtk-doc }: stdenv.mkDerivation rec { @@ -27,6 +29,9 @@ stdenv.mkDerivation rec { pkg-config libxslt makeWrapper + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + autoreconfHook + gtk-doc ]; propagatedBuildInputs = [ @@ -49,7 +54,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Only; maintainers = with maintainers; [ ]; platforms = platforms.unix; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; }