From 268d8dbf1b90fe68f6c7af2078794bc0674aead2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 19 Sep 2016 00:00:00 +0200 Subject: [PATCH] blink: works with recent gnutls versions --- .../networking/instant-messengers/blink/default.nix | 5 ++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index e771db3795b..f0b74370c3c 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -4,7 +4,7 @@ pythonPackages.buildPythonApplication rec { name = "blink-${version}"; version = "2.0.0"; - + src = fetchurl { url = "http://download.ag-projects.com/BlinkQt/${name}.tar.gz"; sha256 = "07hvy45pavgkvdlh4wbz3shsxh4fapg96qlqmfymdi1nfhwghb05"; @@ -15,8 +15,7 @@ pythonPackages.buildPythonApplication rec { sed -i 's|@out@|'"''${out}"'|g' blink/resources.py ''; - propagatedBuildInputs = with pythonPackages;[ pyqt4 cjson sipsimple twisted - ]; + propagatedBuildInputs = with pythonPackages; [ pyqt4 cjson sipsimple twisted ]; buildInputs = [ pythonPackages.cython zlib libvncserver libvpx ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c94c51c16c7..bce2c67992b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -604,9 +604,7 @@ in bitbucket-cli = pythonPackages.bitbucket-cli; - blink = callPackage ../applications/networking/instant-messengers/blink { - gnutls = gnutls33; - }; + blink = callPackage ../applications/networking/instant-messengers/blink { }; blink1-tool = callPackage ../tools/misc/blink1-tool { };