swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 21:09:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

blink: 3.0.3 -> 3.2.0

Browse source
This commit is contained in:
Michiel Leenaars 2019-09-10 08:00:20 +02:00
parent f075f52177
commit 5c62f526d5
2 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
pkgs/applications/networking/instant-messengers/blink/default.nix
View file

@ -1,14 +1,15 @@
{ stdenv, fetchdarcs, pythonPackages, libvncserver, zlib
, gnutls, libvpx, makeDesktopItem }:
, gnutls, libvpx, makeDesktopItem, mkDerivationWith }:
mkDerivationWith pythonPackages.buildPythonApplication rec {
pythonPackages.buildPythonApplication rec {
pname = "blink";
version = "3.0.3";
version = "3.2.0";
src = fetchdarcs {
url = http://devel.ag-projects.com/repositories/blink-qt;
rev = "release-${version}";
sha256 = "1vj6zzfvxygz0fzr8bhymcw6j4v8xmr0kba53d6qg285j7hj1bdi";
sha256 = "19rcwr5scw48qnj79q1pysw95fz9h98nyc3161qy2kph5g7dwkc3";
};
patches = [ ./pythonpath.patch ];
@ -16,9 +17,20 @@ pythonPackages.buildPythonApplication rec {
sed -i 's|@out@|'"''${out}"'|g' blink/resources.py
'';
propagatedBuildInputs = with pythonPackages; [ pyqt5_with_qtwebkit cjson sipsimple twisted google_api_python_client ];
propagatedBuildInputs = with pythonPackages; [
pyqt5_with_qtwebkit
cjson
sipsimple
twisted
google_api_python_client
];
buildInputs = [ pythonPackages.cython zlib libvncserver libvpx ];
buildInputs = [
pythonPackages.cython
zlib
libvncserver
libvpx
];
desktopItem = makeDesktopItem {
name = "Blink";
@ -30,9 +42,14 @@ pythonPackages.buildPythonApplication rec {
categories = "Application;Internet;";
};
dontWrapQtApps = true;
makeWrapperArgs = [
"\${qtWrapperArgs[@]}"
"--prefix LD_LIBRARY_PATH: ${gnutls.out}/lib"
];
postInstall = ''
wrapProgram $out/bin/blink \
--prefix LD_LIBRARY_PATH ":" ${gnutls.out}/lib
mkdir -p "$out/share/applications"
mkdir -p "$out/share/pixmaps"
cp "$desktopItem"/share/applications/* "$out/share/applications"

2
pkgs/top-level/all-packages.nix
View file

@ -1100,7 +1100,7 @@ in
bitbucket-cli = python2Packages.bitbucket-cli;
blink = callPackage ../applications/networking/instant-messengers/blink { };
blink = libsForQt5.callPackage ../applications/networking/instant-messengers/blink { };
blockbook = callPackage ../servers/blockbook { };