Author: raskin
Date: Sun Sep 5 23:37:54 2010
New Revision: 23653
URL: https://svn.nixos.org/websvn/nix/?rev=23653&sc=1
Log:
Adding Ekiga
Added:
nixpkgs/trunk/pkgs/applications/networking/ekiga/
nixpkgs/trunk/pkgs/applications/networking/ekiga/default.nix
nixpkgs/trunk/pkgs/development/libraries/opal/
nixpkgs/trunk/pkgs/development/libraries/opal/default.nix
nixpkgs/trunk/pkgs/development/libraries/ptlib/
nixpkgs/trunk/pkgs/development/libraries/ptlib/default.nix
nixpkgs/trunk/pkgs/development/libraries/srtp/
nixpkgs/trunk/pkgs/development/libraries/srtp/default.nix
nixpkgs/trunk/pkgs/servers/evolution-data-server/
nixpkgs/trunk/pkgs/servers/evolution-data-server/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/applications/networking/ekiga/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/networking/ekiga/default.nix Sun Sep
5 23:37:54 2010 (r23653)
@@ -0,0 +1,71 @@
+...@{builderdefspackage
+ , cyrus_sasl, gettext, openldap, ptlib, opal, GConf, libXv, rarian, intltool
+ , perl, perlXMLParser, evolution_data_server, gnome_doc_utils, avahi
+ , libsigcxx, gtk, dbus_glib, libnotify, libXext, xextproto, automake
+ , autoconf, pkgconfig, libxml2, videoproto, unixODBC, db4, nspr, nss, zlib
+ , libXrandr, randrproto, which, libxslt
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ [];
+
+ buildInputs = map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+ baseName="ekiga";
+ baseVersion="3.2";
+ patchlevel="7";
+ version="${baseVersion}.${patchlevel}";
+ name="${baseName}-${version}";
+ url="mirror://gnome/sources/${baseName}/${baseVersion}/${name}.tar.bz2";
+ hash="13zxwfqhp7pisadx0hq50qwnj6d8r4dldvbs1ngydbwfnq4i6npj";
+ };
+in
+rec {
+ src = a.fetchurl {
+ url = sourceInfo.url;
+ sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = ["setVars" "doConfigure" "doMakeInstall"];
+ configureFlags = [
+ "--with-ldap-dir=${openldap}"
+ "--with-libsasl2-dir=${cyrus_sasl}"
+ ];
+
+ setVars = a.noDepEntry (''
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${opal}/include/opal"
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo
${evolution_data_server}/include/evolution-*)"
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE
-I${libxml2}/include/libxml2"
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${GConf}/include/gconf/2"
+
+ export NIX_LDFLAGS="$NIX_LDFLAGS -lopal"
+ for i in ${evolution_data_server}/lib/lib*.so; do
+ file="$(basename "$i" .so)"
+ bn="''${file#lib}"
+ export NIX_LDFLAGS="$NIX_LDFLAGS -l$bn"
+ done
+ '');
+
+ meta = {
+ description = "Ekiga SIP client";
+ maintainers = with a.lib.maintainers;
+ [
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ linux;
+ };
+ passthru = {
+ updateInfo = {
+ downloadPage = "mirror://gnome/sources/ekiga";
+ };
+ };
+}) x
+
Added: nixpkgs/trunk/pkgs/development/libraries/opal/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/opal/default.nix Sun Sep 5
23:37:54 2010 (r23653)
@@ -0,0 +1,56 @@
+...@{builderdefspackage
+ , doxygen, pkgconfig, ptlib, srtp, libtheora, speex
+ , ffmpeg, x264, cyrus_sasl, openldap, openssl, expat, unixODBC
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ [];
+
+ buildInputs = map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+ baseName="opal";
+ baseVersion="3.6";
+ patchlevel="8";
+ version="${baseVersion}.${patchlevel}";
+ name="${baseName}-${version}";
+ url="mirror://gnome/sources/${baseName}/${baseVersion}/${name}.tar.bz2";
+ hash="0359wqmrxqajd94sw3q2dn6n6y3caggavwdcmzyn6maw7srspgwc";
+ };
+in
+rec {
+ src = a.fetchurl {
+ url = sourceInfo.url;
+ sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = ["setVars" "doConfigure" "doMakeInstall"];
+ configureFlags = [
+ "--enable-h323"
+ ];
+ setVars = a.noDepEntry (''
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D__STDC_CONSTANT_MACROS=1"
+ '');
+
+ meta = {
+ description = "OPAL VoIP library";
+ maintainers = with a.lib.maintainers;
+ [
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ linux;
+ };
+ passthru = {
+ updateInfo = {
+ downloadPage = "http://ftp.gnome.org/pub/GNOME/sources/opal";;
+ };
+ };
+}) x
+
Added: nixpkgs/trunk/pkgs/development/libraries/ptlib/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/ptlib/default.nix Sun Sep 5
23:37:54 2010 (r23653)
@@ -0,0 +1,50 @@
+...@{builderdefspackage
+ , autoconf, automake, libtool, doxygen, pkgconfig, bison, flex, unixODBC
+ , openssl, openldap, cyrus_sasl, krb5, expat, SDL, libdv, libv4l, alsaLib
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ [];
+
+ buildInputs = map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+ baseName="ptlib";
+ baseVersion="2.6";
+ patchlevel="7";
+ version="${baseVersion}.${patchlevel}";
+ name="${baseName}-${version}";
+ url="mirror://gnome/sources/${baseName}/${baseVersion}/${name}.tar.bz2";
+ hash="0zxrygl2ivbciqf97yd9n67ch9vd9gp236w96i6ia8fxzqjq5lkx";
+ };
+in
+rec {
+ src = a.fetchurl {
+ url = sourceInfo.url;
+ sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = ["doConfigure" "doMakeInstall"];
+
+ meta = {
+ description = "Portable Tools from OPAL VoIP";
+ maintainers = with a.lib.maintainers;
+ [
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ linux;
+ };
+ passthru = {
+ updateInfo = {
+ downloadPage = "http://ftp.gnome.org/sources/ptlib/";;
+ };
+ };
+}) x
+
Added: nixpkgs/trunk/pkgs/development/libraries/srtp/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/srtp/default.nix Sun Sep 5
23:37:54 2010 (r23653)
@@ -0,0 +1,47 @@
+...@{builderdefspackage
+ , autoconf, automake, libtool, doxygen, procps
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ [];
+
+ buildInputs = map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+ baseName="srtp";
+ version="1.4.2";
+ name="${baseName}-${version}";
+ url="http://srtp.sourceforge.net/${name}.tgz";;
+ hash="1497mcxharnhiccjhny30g4wlv28ckdxhj14jrwvdnnvhl80jf43";
+ };
+in
+rec {
+ src = a.fetchurl {
+ url = sourceInfo.url;
+ sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = ["doConfigure" "doMakeInstall"];
+
+ meta = {
+ description = "Secure RTP";
+ maintainers = with a.lib.maintainers;
+ [
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ linux;
+ };
+ passthru = {
+ updateInfo = {
+ downloadPage = "http://srtp.sourceforge.net/download.html";;
+ };
+ };
+}) x
+
Added: nixpkgs/trunk/pkgs/servers/evolution-data-server/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/servers/evolution-data-server/default.nix Sun Sep
5 23:37:54 2010 (r23653)
@@ -0,0 +1,56 @@
+...@{builderdefspackage
+ , pkgconfig, flex, bison, libtool, intltool, perl
+ , db4, krb5, openldap, glib, libxml2, GConf
+ , nss, gtk, libgnome, libsoup, gnome_keyring
+ , gtkdoc, sqlite, libgweather, libical, icu
+ , dbus_glib, gperf, nspr, gdk_pixbuf ? null
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ [];
+
+ buildInputs = map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+ url =
"mirror://gnome/sources/evolution-data-server/2.30/evolution-data-server-2.30.3.tar.bz2";
+ hash = "147qkpiafrlq220qg2pmp9lbvh8bn339wh1699bgb7rvmdvycwrp";
+ version = "2.30.3";
+ name = "evolution-data-server-${version}";
+ };
+in
+rec {
+ src = a.fetchurl {
+ url = sourceInfo.url;
+ sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = ["doConfigure" "doMakeInstall"];
+
+ configureFlags = [
+ "--with-nspr-includes=${nspr}/include/nspr"
+ "--with-nss-includes=${nss}/include/nss"
+ ];
+
+ meta = {
+ description = "Evolution Data Server";
+ maintainers = with a.lib.maintainers;
+ [
+ /* I am only interested in it for libebook... */
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ linux;
+ };
+ passthru = {
+ updateInfo = {
+ downloadPage = "http://projects.gnome.org/evolution/download.shtml";;
+ };
+ };
+}) x
+
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Sep 5 18:57:43
2010 (r23652)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Sep 5 23:37:54
2010 (r23653)
@@ -3589,6 +3589,8 @@
opensc = opensc_0_11_7;
};
+ opal = callPackage ../development/libraries/opal {};
+
openjpeg = callPackage ../development/libraries/openjpeg { };
openssl = callPackage ../development/libraries/openssl {
@@ -3640,6 +3642,8 @@
pth = callPackage ../development/libraries/pth { };
+ ptlib = callPackage ../development/libraries/ptlib {};
+
qjson = callPackage ../development/libraries/qjson { };
qt3 = callPackage ../development/libraries/qt-3 {
@@ -3738,6 +3742,8 @@
speex = callPackage ../development/libraries/speex { };
+ srtp = callPackage ../development/libraries/srtp {};
+
sqlite = callPackage ../development/libraries/sqlite {
readline = null;
ncurses = null;
@@ -5455,6 +5461,10 @@
libgnomeui libglade glib gtk scrollkeeper gnome_keyring;
};
+ evolution_data_server = (newScope (gnome // gtkLibs))
+ ../servers/evolution-data-server {
+ };
+
exrdisplay = callPackage ../applications/graphics/exrdisplay {
fltk = fltk20;
};
@@ -6869,6 +6879,9 @@
dpkg = callPackage ../tools/package-management/dpkg { };
+ ekiga = lib.callPackageWith (pkgs // pkgs.xorg // pkgs.gtkLibs // pkgs.gnome)
+ ../applications/networking/ekiga {};
+
electricsheep = callPackage ../misc/screensavers/electricsheep { };
foldingathome = callPackage ../misc/foldingathome { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
