public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

protonmail-bridge: 1.1.5 -> 1.1.6

Browse Source
This commit is contained in:
GRBurst 2019-07-23 22:11:28 +02:00 committed by worldofpeace
parent b4522d230e
commit c4cebed811
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/networking/protonmail-bridge/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtsvg, qtdeclarative, qttools, full { stdenv, fetchurl, lib, qtbase, qtmultimedia, qtsvg, qtdeclarative, qttools, qtgraphicaleffects, qtquickcontrols2, full
, libsecret, libGL, libpulseaudio, glib, wrapQtAppsHook, makeDesktopItem }: , libsecret, libGL, libpulseaudio, glib, wrapQtAppsHook, makeDesktopItem, mkDerivation }:
let let
version = "1.1.5-1"; version = "1.1.6-1";
description = '' description = ''
An application that runs on your computer in the background and seamlessly encrypts An application that runs on your computer in the background and seamlessly encrypts
@ -20,16 +20,15 @@ let
genericName = "ProtonMail Bridge for Linux"; genericName = "ProtonMail Bridge for Linux";
categories = "Utility;Security;Network;Email"; categories = "Utility;Security;Network;Email";
}; };
in stdenv.mkDerivation rec {
in mkDerivation rec {
name = "protonmail-bridge-${version}"; name = "protonmail-bridge-${version}";
src = fetchurl { src = fetchurl {
url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb"; url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb";
sha256 = "1y5mphrs60zd6km9z64vskk70q9zzw4g6js7qvgl572wv81w2l75"; sha256 = "108dql9q5znsqjkrs41pc6psjbg5bz09rdmjl036xxbvsdvq4a8r";
}; };
nativeBuildInputs = [ wrapQtAppsHook ];
sourceRoot = "."; sourceRoot = ".";
unpackCmd = '' unpackCmd = ''
@ -51,6 +50,8 @@ in stdenv.mkDerivation rec {
rpath = lib.makeLibraryPath [ rpath = lib.makeLibraryPath [
stdenv.cc.cc.lib stdenv.cc.cc.lib
qtbase qtbase
qtquickcontrols2
qtgraphicaleffects
qtmultimedia qtmultimedia
qtsvg qtsvg
qtdeclarative qtdeclarative
@ -67,6 +68,8 @@ in stdenv.mkDerivation rec {
$out/lib/protonmail-bridge $out/lib/protonmail-bridge
''; '';
buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://www.protonmail.com/bridge"; homepage = "https://www.protonmail.com/bridge";
license = licenses.mit; license = licenses.mit;

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

@ -19869,7 +19869,7 @@ in
properties-cpp = callPackage ../development/libraries/properties-cpp { }; properties-cpp = callPackage ../development/libraries/properties-cpp { };
protonmail-bridge = libsForQt511.callPackage ../applications/networking/protonmail-bridge { }; protonmail-bridge = libsForQt512.callPackage ../applications/networking/protonmail-bridge { };
protonvpn-cli = callPackage ../applications/networking/protonvpn-cli { }; protonvpn-cli = callPackage ../applications/networking/protonvpn-cli { };