ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1797 from lethalman/empathy

Browse Source 
new empathy, folks and clutter-gst packages, with related lib changes
This commit is contained in:
Domen Kožar 2014-02-21 12:56:51 +01:00
commit 0ca4f087b3
11 changed files with 160 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
configureFlags = "--enable-call";
installFlags = "gsettingsschemadir=\${out}/share/telepathy/logger/glib-2.0/schemas/";
meta = {
description = "Logger service for Telepathy framework";
homepage = http://telepathy.freedesktop.org/wiki/Logger ;

59
pkgs/desktops/gnome-3/core/empathy/default.nix Normal file
View File

@ -0,0 +1,59 @@
{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf
, dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream
, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts
, gcr, libsecret, folks, pulseaudio, telepathy_mission_control
, telepathy_logger, libnotify, clutter, libsoup, gnutls
, evolution_data_server
, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info
, bash, makeWrapper, itstool, libxml2, libxslt, icu, libgee }:
# TODO: enable more features
stdenv.mkDerivation rec {
name = "empathy-3.10.3";
src = fetchurl {
url = "mirror://gnome/sources/empathy/3.10/${name}.tar.xz";
sha256 = "49366acdd3c3ef9a74f63eb09920803c4c9df83056acbf8a7899e7890a9fb196";
};
propagatedUserEnvPkgs = [ librsvg gdk_pixbuf gnome3.gnome_themes_standard
gnome3.gnome_icon_theme hicolor_icon_theme
gnome_online_accounts shared_mime_info
gnome3.gnome_icon_theme_symbolic ];
propagatedBuildInputs = [ folks telepathy_logger evolution_data_server
telepathy_mission_control ];
buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool
libxml2 libxslt icu file makeWrapper
telepathy_glib clutter_gtk clutter-gst cogl
gst_all_1.gstreamer gst_all_1.gst-plugins-base
gcr libsecret pulseaudio gnome3.yelp_xsl
libnotify clutter libsoup gnutls libgee p11_kit
libcanberra_gtk3 telepathy_farstream farstream
gnome3.gsettings_desktop_schemas file libtool ];
NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0"
"-I${dbus_libs}/include/dbus-1.0"
"-I${dbus_libs}/lib/dbus-1.0/include" ];
enableParallelBuilding = true;
installFlags = "gsettingsschemadir=\${out}/share/empathy/glib-2.0/schemas/";
postInstall = ''
mkdir -p $out/lib/empathy/gdk-pixbuf-2.0/2.10.0
cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > $out/lib/empathy/gdk-pixbuf-2.0/2.10.0/loaders.cache
wrapProgram "$out/bin/empathy" \
--set GDK_PIXBUF_MODULE_FILE `readlink -e $out/lib/empathy/gdk-pixbuf-2.0/2.10.0/loaders.cache` \
--prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme_symbolic}/share:${gnome3.gnome_icon_theme}/share:${hicolor_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/empathy:${telepathy_logger}/share/telepathy/logger:${folks}/share/folks:${evolution_data_server}/share/evolution-data-server"
'';
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Empathy;
description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols";
maintainers = with maintainers; [ lethalman ];
license = [ licenses.gpl2 licenses.lgpl2 ];
platforms = platforms.linux;
};
}

10
pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, pkgconfig, gnome3, python, intltool, libsoup, libxml2, libsecret
, p11_kit, db, nspr, nss, libical, gperf }:
, p11_kit, db, nspr, nss, libical, gperf, valaSupport ? true, vala }:
stdenv.mkDerivation rec {
@ -12,10 +12,14 @@ stdenv.mkDerivation rec {
buildInputs = with gnome3;
[ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts libsecret
gcr p11_kit db nspr nss libgweather libical libgdata gperf ];
gcr p11_kit db nspr nss libgweather libical libgdata gperf ]
++ stdenv.lib.optional valaSupport vala;
# uoa irrelevant for now
configureFlags = "--disable-uoa --with-nspr-includes=${nspr}/include/nspr --with-nss-includes=${nss}/include/nss";
configureFlags = ["--disable-uoa" "--with-nspr-includes=${nspr}/include/nspr" "--with-nss-includes=${nss}/include/nss"]
++ stdenv.lib.optional valaSupport "--enable-vala-bindings";
installFlags = "gsettingsschemadir=\${out}/share/evolution-data-server/glib-2.0/schemas/";
meta = with stdenv.lib; {
platforms = platforms.linux;

42
pkgs/desktops/gnome-3/core/folks/default.nix Normal file
View File

@ -0,0 +1,42 @@
{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool
, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs
, telepathy_glib, evolution_data_server, libsecret, db }:
# TODO: enable more folks backends
stdenv.mkDerivation rec {
name = "folks-0.9.6";
src = fetchurl {
url = "mirror://gnome/sources/folks/0.9/${name}.tar.xz";
sha256 = "a67e055b5a2724a34a80946e2940c4c0ad708cb1f4e0a09407c6b69a5e40267f";
};
propagatedBuildInputs = [ glib gnome3.libgee sqlite ];
# dbus_daemon needed for tests
buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs
vala libsecret libxml2 libsoup nspr nss intltool db ];
nativeBuildInputs = [ pkgconfig ];
configureFlags = "--disable-fatal-warnings";
NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss"
"-I${dbus_glib}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"];
enableParallelBuilding = true;
postBuild = "rm -rf $out/share/gtk-doc";
installFlags = "gsettingsschemadir=\${out}/share/folks/glib-2.0/schemas/";
meta = {
description = "Folks";
homepage = https://wiki.gnome.org/Projects/Folks;
license = "LGPLv2+";
maintainers = with stdenv.lib.maintainers; [ lethalman ];
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
};
}

5
pkgs/desktops/gnome-3/core/yelp/default.nix
View File

@ -23,9 +23,10 @@ stdenv.mkDerivation rec {
installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/";
postInstall = ''
cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > $out/loaders.cache
mkdir -p $out/lib/yelp/gdk-pixbuf-2.0/2.10.0
cat ${gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache ${librsvg}/lib/gdk-pixbuf/loaders.cache > $out/lib/yelp/gdk-pixbuf-2.0/2.10.0/loaders.cache
wrapProgram "$out/bin/yelp" \
--set GDK_PIXBUF_MODULE_FILE `readlink -e $out/loaders.cache` \
--set GDK_PIXBUF_MODULE_FILE `readlink -e $out/lib/yelp/gdk-pixbuf-2.0/2.10.0/loaders.cache` \
--prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme_symbolic}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gnome_icon_theme}/share:${hicolor_icon_theme}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}"
'';

4
pkgs/desktops/gnome-3/default.nix
View File

@ -20,6 +20,8 @@ rec {
dconf = callPackage ./core/dconf { };
empathy = callPackage ./core/empathy { };
epiphany = callPackage ./core/epiphany { };
evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests
@ -50,6 +52,8 @@ rec {
libgnome_keyring = callPackage ./core/libgnome-keyring { };
folks = callPackage ./core/folks { };
gnome_online_accounts = callPackage ./core/gnome-online-accounts { };
gnome_session = callPackage ./core/gnome-session { };

26
pkgs/development/libraries/clutter-gst/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl }:
stdenv.mkDerivation rec {
name = "clutter-gst-2.0.10";
src = fetchurl {
url = "mirror://gnome/sources/clutter-gst/2.0/${name}.tar.xz";
sha256 = "f00cf492a6d4f1036c70d8a0ebd2f0f47586ea9a9b49b1ffda79c9dc7eadca00";
};
propagatedBuildInputs = [ clutter gtk3 glib cogl ];
nativeBuildInputs = [ pkgconfig ];
postBuild = "rm -rf $out/share/gtk-doc";
meta = {
description = "Clutter-GST";
homepage = http://www.clutter-project.org/;
license = "LGPLv2+";
maintainers = with stdenv.lib.maintainers; [ lethalman ];
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
};
}

6
pkgs/development/libraries/clutter-gtk/default.nix
View File

@ -1,11 +1,11 @@
{ fetchurl, stdenv, pkgconfig, clutter, gtk3 }:
stdenv.mkDerivation rec {
name = "clutter-gtk-1.0.4";
name = "clutter-gtk-1.4.4";
src = fetchurl {
url = mirror://gnome/sources/clutter-gtk/1.0/clutter-gtk-1.0.4.tar.xz;
sha256 = "0kj6vsvaqxx6vqqk9acc8b0p40klrpwlf2wsjkams1kxxcpzsh87";
url = "mirror://gnome/sources/clutter-gtk/1.4/${name}.tar.xz";
sha256 = "bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e";
};
propagatedBuildInputs = [ clutter gtk3 ];

9
pkgs/development/libraries/cogl/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty
, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland }:
, pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland
, gstreamerSupport ? true, gst_all_1 }:
let
ver_maj = "1.16";
@ -22,13 +23,15 @@ stdenv.mkDerivation rec {
"--enable-kms-egl-platform"
"--enable-wayland-egl-platform"
"--enable-wayland-egl-server"
];
] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst";
propagatedBuildInputs = with xorg; [
glib gdk_pixbuf gobjectIntrospection
mesa_noglu libXrandr libXfixes libXcomposite libXdamage wayland
]
++ libintlOrEmpty;
++ libintlOrEmpty
++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer
gst_all_1.gst-plugins-base ];
buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ];

6
pkgs/development/libraries/telepathy/glib/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt
, gobjectIntrospection }:
, gobjectIntrospection, valaSupport ? true, vala }:
stdenv.mkDerivation rec {
name = "telepathy-glib-0.22.0";
@ -9,9 +9,11 @@ stdenv.mkDerivation rec {
sha256 = "0mqrq2azw70rm50vy21acfnzn8mmh0w7dxh87mwr1lyk0jn1n232";
};
configureFlags = stdenv.lib.optional valaSupport "--enable-vala-bindings";
propagatedBuildInputs = [dbus_glib glib python gobjectIntrospection];
buildInputs = [pkgconfig libxslt];
buildInputs = [pkgconfig libxslt] ++ stdenv.lib.optional valaSupport vala;
meta = {
homepage = http://telepathy.freedesktop.org;

4
pkgs/top-level/all-packages.nix
View File

@ -3974,6 +3974,8 @@ let
clutter = callPackage ../development/libraries/clutter { };
clutter-gst = callPackage ../development/libraries/clutter-gst { };
clutter_gtk = callPackage ../development/libraries/clutter-gtk { };
clutter_gtk_0_10 = callPackage ../development/libraries/clutter-gtk/0.10.8.nix { };
@ -7818,6 +7820,8 @@ let
emacs23Packages = emacsPackages emacs23 pkgs.emacs23Packages;
emacs24Packages = recurseIntoAttrs (emacsPackages emacs24 pkgs.emacs24Packages);
inherit (gnome3) empathy;
epdfview = callPackage ../applications/misc/epdfview { };
inherit (gnome3) epiphany;