diff options
author | Jonathan Glines <auntieNeo@gmail.com> | 2015-04-07 22:57:48 -0600 |
---|---|---|
committer | Jonathan Glines <auntieNeo@gmail.com> | 2015-04-08 17:01:37 -0600 |
commit | 2b949cfd46e24e23f4bfabb041068d14f2181587 (patch) | |
tree | 759ce6693e28fb09686cc64d5f3768c102e156a5 /pkgs/applications/networking/instant-messengers/blink | |
parent | a869c8351cfcd6ec42147e7f1c8f4f14ac20e587 (diff) |
Bumped blink version to 1.2.2
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/blink')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/blink/default.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/blink/pythonpath.patch | 30 |
2 files changed, 24 insertions, 13 deletions
diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index a7b5ef6972efc..00a881c0c6769 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -2,14 +2,17 @@ pythonPackages.buildPythonPackage rec { name = "blink-${version}"; - version = "0.9.1"; + version = "1.2.2"; src = fetchurl { url = "http://download.ag-projects.com/BlinkQt/${name}.tar.gz"; - sha256 = "f578e5186893c3488e7773fbb775028ae54540433a0c51aefa5af983ca2bfdae"; + sha256 = "0z7bhfz2775cm7c7s794s5ighp5q7fb6jn8dw025m49vlgqzr78c"; }; patches = [ ./pythonpath.patch ]; + postPatch = '' + sed -i 's|@out@|'"''${out}"'|g' blink/resources.py + ''; propagatedBuildInputs = [ pyqt4 pythonPackages.cjson pythonPackages.sipsimple twisted ]; diff --git a/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch b/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch index 2cf7ba19d3838..723e097ea8260 100644 --- a/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch +++ b/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch @@ -1,12 +1,20 @@ -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 +diff -rupN a/blink/resources.py b/blink/resources.py +--- a/blink/resources.py 2015-03-17 03:24:06.000000000 -0600 ++++ b/blink/resources.py 2015-04-07 22:52:06.101096413 -0600 +@@ -60,14 +60,7 @@ class Resources(object): + @classproperty + def directory(cls): + if cls._cached_directory is None: +- if sys.path[0] == '': +- application_directory = os.path.realpath('') # executed in interactive interpreter +- else: +- binary_directory = os.path.dirname(os.path.realpath(sys.argv[0])) +- if os.path.basename(binary_directory) == 'bin': +- application_directory = os.path.dirname(binary_directory) +- else: +- application_directory = binary_directory ++ application_directory = '@out@' + if os.path.exists(os.path.join(application_directory, 'resources', 'blink.ui')): + cls._cached_directory = os.path.join(application_directory, 'resources').decode(sys.getfilesystemencoding()) 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) +Binary files a/blink/.resources.py.swp and b/blink/.resources.py.swp differ |