summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorDamien Cassou <damien.cassou@gmail.com>2014-12-08 15:59:06 +0100
committerLuca Bruno <lucabru@src.gnome.org>2014-12-12 15:12:19 +0100
commitbc789064d8d13ff14f65161d8d4dcc51667b7248 (patch)
tree4947c116a5ff03a6c33416e5cb8025cb323f1c69 /pkgs
parent40bbc1806a2f26592993d038da89667d6fd6b161 (diff)
downloadnixpkgs-bc789064d8d13ff14f65161d8d4dcc51667b7248.tar
nixpkgs-bc789064d8d13ff14f65161d8d4dcc51667b7248.tar.gz
nixpkgs-bc789064d8d13ff14f65161d8d4dcc51667b7248.tar.bz2
nixpkgs-bc789064d8d13ff14f65161d8d4dcc51667b7248.tar.lz
nixpkgs-bc789064d8d13ff14f65161d8d4dcc51667b7248.tar.xz
nixpkgs-bc789064d8d13ff14f65161d8d4dcc51667b7248.tar.zst
nixpkgs-bc789064d8d13ff14f65161d8d4dcc51667b7248.zip
Package for the Polari IRC app
This commit includes a patch to telepathy's derivation, written by
Lethalman. This patch makes public the Telepathy's dependency to
dbus_glib. This patch will become problematic with the next pkgconfig
upgrade but this upgrade should make the patch irrelevant. See these 2
links for more information:
- https://bugs.freedesktop.org/show_bug.cgi?id=15199
- https://bugzilla.redhat.com/show_bug.cgi?id=436773

Modified by Luca Bruno:
- Moved telepathy_idle to propagatedUserEnvPkgs
- Added myself to maintainers
- Enable parallel building
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix20
-rw-r--r--pkgs/desktops/gnome-3/3.12/apps/polari/default.nix27
-rw-r--r--pkgs/desktops/gnome-3/3.12/default.nix2
-rw-r--r--pkgs/development/libraries/telepathy/glib/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix2
5 files changed, 55 insertions, 0 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
new file mode 100644
index 00000000000..16a31f6f3ba
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, glib, pkgconfig, dbus_glib, telepathy_glib, libxslt }:
+
+stdenv.mkDerivation rec {
+  pname = "telepathy-idle";
+  version = "0.2.0";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
+    sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh";
+  };
+
+  buildInputs = [ pkgconfig glib telepathy_glib dbus_glib libxslt ];
+
+  meta = {
+    description = "IRC connection manager for the Telepathy framework";
+    license = stdenv.lib.licenses.lgpl21;
+    platforms = stdenv.lib.platforms.gnu;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix
new file mode 100644
index 00000000000..f30d1424679
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix
@@ -0,0 +1,27 @@
+{stdenv, fetchurl, makeWrapper, intltool, pkgconfig, gobjectIntrospection, glib, gtk3, telepathy_glib, gnome3, telepathy_idle }:
+
+stdenv.mkDerivation rec {
+  version = "3.12.2";
+  name = "polari-${version}";
+  src = fetchurl {
+    url = "https://download.gnome.org/sources/polari/3.12/polari-${version}.tar.xz";
+    sha256 = "8b10f369fac9e5e48a7bed51320754262d00c1bb14899a321b02843e20c0a995";
+  };
+  buildInputs = [ makeWrapper intltool pkgconfig gobjectIntrospection glib gtk3 telepathy_glib gnome3.gjs ];
+  propagatedUserEnvPkgs = [ telepathy_idle ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/polari" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" 
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Internet Relay Chat (IRC) client designed for GNOME 3";
+    homepage = https://wiki.gnome.org/Apps/Polari;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix
index a60e1a85bca..7a972925f66 100644
--- a/pkgs/desktops/gnome-3/3.12/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/default.nix
@@ -234,6 +234,8 @@ rec {
 
   seahorse = callPackage ./apps/seahorse { };
 
+  polari = callPackage ./apps/polari { };
+
   pomodoro = callPackage ./apps/pomodoro { };
 
 #### Dev http://ftp.gnome.org/pub/GNOME/devtools/
diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix
index 6c0806ec4cd..9167ecc76d4 100644
--- a/pkgs/development/libraries/telepathy/glib/default.nix
+++ b/pkgs/development/libraries/telepathy/glib/default.nix
@@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [pkgconfig libxslt] ++ stdenv.lib.optional valaSupport vala;
 
+  preConfigure = ''
+    substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires
+  '';
+
   meta = {
     homepage = http://telepathy.freedesktop.org;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 515c7f45279..cffc67c7bf8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10881,6 +10881,8 @@ let
 
   telepathy_salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {};
 
+  telepathy_idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {};
+
   terminator = callPackage ../applications/misc/terminator {
     vte = gnome.vte.override { pythonSupport = true; };
     inherit (pythonPackages) notify;