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

telepathy-*: add darwin support
This commit is contained in:
Weijia Wang 2023-10-17 12:49:23 +02:00 committed by GitHub
commit cb990a2783
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 11 deletions

View file

@ -30,9 +30,9 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
meta = with lib; { meta = with lib; {
homepage = "https://telepathy.freedesktop.org/components/telepathy-gabble/";
description = "Jabber/XMPP connection manager for the Telepathy framework"; description = "Jabber/XMPP connection manager for the Telepathy framework";
homepage = "https://telepathy.freedesktop.org/components/telepathy-gabble/";
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
platforms = lib.platforms.gnu ++ lib.platforms.linux; platforms = lib.platforms.unix;
}; };
} }

View file

@ -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 { stdenv.mkDerivation rec {
pname = "telepathy-haze"; pname = "telepathy-haze";
@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A Telepathy connection manager based on libpurple"; 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;
}; };
} }

View file

@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "IRC connection manager for the Telepathy framework"; description = "IRC connection manager for the Telepathy framework";
license = lib.licenses.lgpl21; homepage = "https://telepathy.freedesktop.org/components/telepathy-idle/";
platforms = lib.platforms.gnu ++ lib.platforms.linux; license = lib.licenses.lgpl21Plus;
platforms = lib.platforms.unix;
}; };
} }

View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, python3, pkg-config { lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, python3, pkg-config
, dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus , dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus
, fetchpatch , fetchpatch, darwin
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -26,6 +26,9 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
dbus-glib libxml2 sqlite telepathy-glib dbus-glib libxml2 sqlite telepathy-glib
dbus dbus
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.AppKit
darwin.apple_sdk.frameworks.Foundation
]; ];
configureFlags = [ "--enable-call" ]; configureFlags = [ "--enable-call" ];
@ -39,8 +42,8 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Logger service for Telepathy framework"; description = "Logger service for Telepathy framework";
homepage = "https://telepathy.freedesktop.org/components/telepathy-logger/"; homepage = "https://telepathy.freedesktop.org/components/telepathy-logger/";
license = licenses.lgpl21; license = licenses.lgpl21Plus;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
platforms = platforms.gnu ++ platforms.linux; # Arbitrary choice platforms = platforms.unix;
}; };
} }

View file

@ -6,6 +6,8 @@
, python3 , python3
, libxslt , libxslt
, makeWrapper , makeWrapper
, autoreconfHook
, gtk-doc
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -27,6 +29,9 @@ stdenv.mkDerivation rec {
pkg-config pkg-config
libxslt libxslt
makeWrapper makeWrapper
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
autoreconfHook
gtk-doc
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -49,7 +54,5 @@ stdenv.mkDerivation rec {
license = licenses.lgpl21Only; license = licenses.lgpl21Only;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
platforms = platforms.unix; platforms = platforms.unix;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
}; };
} }