Unverified Commit cb990a27 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #261511 from wegank/telepathy-logger-darwin 

telepathy-*: add darwin support
parents 28c72be9 1005b082

pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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;

  };

}

pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix

+4 −2
Original line number Diff line number Diff line 
{ 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;

  };

}

pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix

+3 −2
Original line number Diff line number Diff line
@@ -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;

  };

}

pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix

+6 −3
Original line number Diff line number Diff line 
{ 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;

  };

}

pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix

+5 −2
Original line number Diff line number Diff line
@@ -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;

  };

}