commit 2425f27b175d76765c574a66d53d138b9d120cf6 · pyrox.dev/nixpkgs

+5 -2

pkgs/applications/networking/instant-messengers/blink/default.nix

···

       2
       2
        
       

     

       3
       3
        
       pythonPackages.buildPythonPackage rec {

     

       4
       4
        
         name = "blink-${version}";

     

       5
       5
       -
         version = "0.9.1";

     

       5
       5
       +
         version = "1.2.2";

     

       6
       6
        
         

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "http://download.ag-projects.com/BlinkQt/${name}.tar.gz";

     

       9
       9
       -
           sha256 = "f578e5186893c3488e7773fbb775028ae54540433a0c51aefa5af983ca2bfdae";

     

       9
       9
       +
           sha256 = "0z7bhfz2775cm7c7s794s5ighp5q7fb6jn8dw025m49vlgqzr78c";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         patches = [ ./pythonpath.patch ];

     

       13
       13
       +
         postPatch = ''

     

       14
       14
       +
           sed -i 's|@out@|'"''${out}"'|g' blink/resources.py

     

       15
       15
       +
         '';

     

       13
       16
        
       

     

       14
       17
        
         propagatedBuildInputs = [ pyqt4 pythonPackages.cjson pythonPackages.sipsimple twisted ];

     

       15
       18

+19 -11

pkgs/applications/networking/instant-messengers/blink/pythonpath.patch

···

       1
       1
       -
       diff --git a/blink/resources.py b/blink/resources.py

     

       2
       2
       -
       index 524d9e5..c271887 100644

     

       3
       3
       -
       --- a/blink/resources.py

     

       4
       4
       -
       +++ b/blink/resources.py

     

       5
       5
       -
       @@ -64,6 +64,7 @@ class Resources(object):

     

       6
       6
       -
                    if script == '':

     

       7
       7
       -
                        application_directory = os.path.realpath(script) # executed in interactive interpreter

     

       1
       1
       +
       diff -rupN a/blink/resources.py b/blink/resources.py

     

       2
       2
       +
       --- a/blink/resources.py	2015-03-17 03:24:06.000000000 -0600

     

       3
       3
       +
       +++ b/blink/resources.py	2015-04-07 22:52:06.101096413 -0600

     

       4
       4
       +
       @@ -60,14 +60,7 @@ class Resources(object):

     

       5
       5
       +
            @classproperty

     

       6
       6
       +
            def directory(cls):

     

       7
       7
       +
                if cls._cached_directory is None:

     

       8
       8
       +
       -            if sys.path[0] == '':

     

       9
       9
       +
       -                application_directory = os.path.realpath('') # executed in interactive interpreter

     

       10
       10
       +
       -            else:

     

       11
       11
       +
       -                binary_directory = os.path.dirname(os.path.realpath(sys.argv[0]))

     

       12
       12
       +
       -                if os.path.basename(binary_directory) == 'bin':

     

       13
       13
       +
       -                    application_directory = os.path.dirname(binary_directory)

     

       14
       14
       +
       -                else:

     

       15
       15
       +
       -                    application_directory = binary_directory

     

       16
       16
       +
       +            application_directory = '@out@'

     

       17
       17
       +
                    if os.path.exists(os.path.join(application_directory, 'resources', 'blink.ui')):

     

       18
       18
       +
                        cls._cached_directory = os.path.join(application_directory, 'resources').decode(sys.getfilesystemencoding())

     

       8
       19
        
                    else:

     

       9
       9
       -
       +                script = os.path.join(sys.path[0], script)

     

       10
       10
       -
                        binary_directory = os.path.dirname(os.path.realpath(script))

     

       11
       11
       -
                        if os.path.basename(binary_directory) == 'bin':

     

       12
       12
       -
                            application_directory = os.path.dirname(binary_directory)

     

       20
       20
       +
       Binary files a/blink/.resources.py.swp and b/blink/.resources.py.swp differ

+4 -4

pkgs/top-level/python-packages.nix

···

       10982
       10982
        
       

     

       10983
       10983
        
         sipsimple = buildPythonPackage rec {

     

       10984
       10984
        
           name = "sipsimple-${version}";

     

       10985
       10985
       -
           version = "1.4.2";

     

       10985
       10985
       +
           version = "2.3.1";

     

       10986
       10986
        
           disabled = isPy3k;

     

       10987
       10987
        
       

     

       10988
       10988
        
           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";

     

       10989
       10989
        
       

     

       10990
       10990
        
           src = pkgs.fetchurl {

     

       10991
       10991
        
             url = "http://download.ag-projects.com/SipClient/python-${name}.tar.gz";

     

       10992
       10992
       -
             sha256 = "f6e6de7ab5f20e8ae08966b8811462e4271833db4f7fbab58ffba4e5c07ab114";

     

       10992
       10992
       +
             sha256 = "1n3g1zg3zgdybikdla0qdqvpa06vn1ka2asr61lb8kk6xbvqkljv";

     

       10993
       10993
        
           };

     

       10994
       10994
        
       

     

       10995
       10995
       -
           propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib];

     

       10995
       10995
       +
           propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml ];

     

       10996
       10996
        
       

     

       10997
       10997
       -
           buildInputs = with self; [ pkgs.alsaLib ];

     

       10997
       10997
       +
           buildInputs = with pkgs; [ alsaLib ffmpeg libv4l pkgconfig sqlite ];

     

       10998
       10998
        
       

     

       10999
       10999
        
           installPhase = "${python}/bin/${python.executable} setup.py install --prefix=$out";

     

       11000
       11000