Merge pull request #4551 from vandenoever/blink

Add Blink, a simple sip client.
This commit is contained in:
Peter Simons 2014-10-16 15:48:32 +02:00
commit 9e74259bbe
4 changed files with 165 additions and 4 deletions

View file

@ -0,0 +1,27 @@
{ stdenv, fetchurl, pythonPackages, pyqt4, cython, libvncserver, zlib, twisted, gnutls }:
pythonPackages.buildPythonPackage rec {
name = "blink-${version}";
version = "0.9.1";
src = fetchurl {
url = "http://download.ag-projects.com/BlinkQt/${name}.tar.gz";
sha256 = "f578e5186893c3488e7773fbb775028ae54540433a0c51aefa5af983ca2bfdae";
};
patches = [ ./pythonpath.patch ];
propagatedBuildInputs = [ pyqt4 pythonPackages.cjson pythonPackages.sipsimple twisted ];
buildInputs = [ cython zlib libvncserver ];
postInstall = ''
wrapProgram $out/bin/blink \
--prefix LD_LIBRARY_PATH : ${gnutls}/lib
'';
meta = {
homepage = http://icanblink.com/;
description = "A state of the art, easy to use SIP client";
};
}

View file

@ -0,0 +1,12 @@
diff --git a/blink/resources.py b/blink/resources.py
index 524d9e5..c271887 100644
--- a/blink/resources.py
+++ b/blink/resources.py
@@ -64,6 +64,7 @@ class Resources(object):
if script == '':
application_directory = os.path.realpath(script) # executed in interactive interpreter
else:
+ script = os.path.join(sys.path[0], script)
binary_directory = os.path.dirname(os.path.realpath(script))
if os.path.basename(binary_directory) == 'bin':
application_directory = os.path.dirname(binary_directory)

View file

@ -617,6 +617,8 @@ let
bitbucket-cli = pythonPackages.bitbucket-cli;
blink = callPackage ../applications/networking/instant-messengers/blink { };
blockdiag = pythonPackages.blockdiag;
bmon = callPackage ../tools/misc/bmon { };

View file

@ -393,6 +393,17 @@ let
};
application = buildPythonPackage rec {
name = "python-application-${version}";
version = "1.4.1";
src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/p/python-application/${name}.tar.gz";
sha256 = "3ae188e9dfd4bd63c9b43aebbf1d9de5df03fb5ac01e72f3bff5b41007570275";
};
};
apsw = buildPythonPackage rec {
name = "apsw-3.7.6.2-r1";
disabled = isPyPy;
@ -1277,6 +1288,24 @@ let
});
cjson = buildPythonPackage rec {
name = "python-cjson-${version}";
version = "1.1.0";
src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/p/python-cjson/${name}.tar.gz";
sha256 = "a01fabb7593728c3d851e1cd9a3efbd18f72650a31a5aa8a74018640da3de8b3";
};
meta = with stdenv.lib; {
description = "This module implements a very fast JSON encoder/decoder for Python.";
homepage = "http://ag-projects.com/";
license = licenses.lgpl2;
platforms = platforms.all;
};
};
click = buildPythonPackage {
name = "click-2.1";
src = pkgs.fetchurl {
@ -1952,6 +1981,16 @@ let
};
};
dns = buildPythonPackage rec {
name = "dnspython-${version}";
version = "1.12.0";
src = pkgs.fetchurl {
url = "http://www.dnspython.org/kits/1.12.0/dnspython-1.12.0.tar.gz";
sha256 = "0kvjlkp96qzh3j31szpjlzqbp02brixh4j4clnpw80b0hspq5yq3";
};
};
docker = buildPythonPackage rec {
name = "docker-py-0.4.0";
@ -2118,6 +2157,26 @@ let
};
eventlib = buildPythonPackage rec {
name = "python-eventlib-${version}";
version = "0.2.0";
src = pkgs.fetchurl {
url = "http://download.ag-projects.com/SipClient/${name}.tar.gz";
sha256 = "0fld5lb85ql4a5bgc38sdxi5pgzqljysp1p8f7abxnd6vymh4rgi";
};
propagatedBuildInputs = with self; [ greenlet ];
meta = with stdenv.lib; {
description = "Eventlib bindings for python.";
homepage = "http://ag-projects.com/";
license = licenses.lgpl2;
platforms = platforms.all;
};
};
eyeD3 = buildPythonPackage rec {
version = "0.7.4";
name = "eyeD3-${version}";
@ -2318,6 +2377,16 @@ let
propagatedBuildInputs = with self; [ gflags iso8601_0_1_4 ipaddr httplib2 google_apputils google_api_python_client ];
};
gnutls = buildPythonPackage rec {
name = "python-gnutls";
src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/p/python-gnutls/python-gnutls-2.0.1.tar.gz";
sha256 = "d8fb368c6a4dd58bc6cd5e61d4a12d119c4506fd344a371b3429b3ac2623b9ac";
};
propagatedBuildInputs = with self; [ pkgs.gnutls ];
};
gitdb = buildPythonPackage rec {
name = "gitdb-0.5.4";
meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
@ -4060,18 +4129,22 @@ let
};
};
greenlet = buildPythonPackage rec {
name = "greenlet-0.4.3";
name = "greenlet-${version}";
version = "0.4.4";
disabled = isPyPy; # builtin for pypy
src = pkgs.fetchurl {
url = "http://pypi.python.org/packages/source/g/greenlet/${name}.zip";
md5 = "a5e467a5876c415cd357c1ab9027e06c";
url = "https://pypi.python.org/packages/source/g/greenlet/${name}.zip";
sha256 = "935a76b7ad3c41846af26e136e2fd8ec763794cbc5b5fbc4b7b09d9a8de1d056";
};
meta = {
meta = with stdenv.lib; {
homepage = http://pypi.python.org/pypi/greenlet;
description = "Module for lightweight in-process concurrent programming";
license = licenses.lgpl2;
platforms = platforms.all;
};
};
@ -5096,6 +5169,19 @@ let
};
msrplib = buildPythonPackage rec {
name = "python-msrplib-${version}";
version = "0.15.0";
src = pkgs.fetchurl {
url = "http://download.ag-projects.com/SipClient/${name}.tar.gz";
sha256 = "1sm03jcz663xkbhfmrk7rr5l3wlkydn8xs56fvqjxyapx0m5sw6f";
};
propagatedBuildInputs = with self; [ eventlib application gnutls ];
};
munkres = buildPythonPackage rec {
name = "munkres-1.0.6";
@ -8325,6 +8411,27 @@ let
};
sipsimple = buildPythonPackage rec {
name = "sipsimple-${version}";
version = "1.4.2";
configurePhase = "find -name 'configure' -exec chmod a+x {} \\; ; find -name 'aconfigure' -exec chmod a+x {} \\; ; ${python}/bin/${python.executable} setup.py build_ext --pjsip-clean-compile";
src = pkgs.fetchurl {
url = "http://download.ag-projects.com/SipClient/python-${name}.tar.gz";
sha256 = "f6e6de7ab5f20e8ae08966b8811462e4271833db4f7fbab58ffba4e5c07ab114";
};
propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib];
buildInputs = with self; [ pkgs.alsaLib ];
installPhase = "${python}/bin/${python.executable} setup.py install --prefix=$out";
doCheck = false;
};
six = buildPythonPackage rec {
name = "six-1.7.3";
@ -9511,6 +9618,18 @@ let
wxGTK = pkgs.wxGTK30;
};
xcaplib = buildPythonPackage rec {
name = "python-xcaplib-${version}";
version = "1.0.17";
src = pkgs.fetchurl {
url = "http://download.ag-projects.com/SipClient/${name}.tar.gz";
sha256 = "1bf8n9ghmgxz8kjgnwy4y7ajijy5hi7viabgh0pvzkhz9gfvck86";
};
propagatedBuildInputs = with self; [ eventlib application ];
};
xe = buildPythonPackage rec {
url = "http://www.blarg.net/%7Esteveha/xe-0.7.4.tar.gz";
name = stdenv.lib.nameFromURL url ".tar";
@ -10953,6 +11072,7 @@ let
};
};
grequests = buildPythonPackage rec {
name = "grequests-0.2.0";