cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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;
};
}

6
pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
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 {
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;
};
}

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

@ -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;
};
}

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

@ -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;
};
}

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

@ -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;
};
}