cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #65315 from GRBurst/protonmail-bridge

Browse source 
protonmail-bridge: 1.1.5 -> 1.1.6
This commit is contained in:
worldofpeace 2019-07-24 18:35:41 -04:00 committed by GitHub
commit 2bcc9260e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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
, libsecret, libGL, libpulseaudio, glib, wrapQtAppsHook, makeDesktopItem }:
{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtsvg, qtdeclarative, qttools, qtgraphicaleffects, qtquickcontrols2, full
, libsecret, libGL, libpulseaudio, glib, wrapQtAppsHook, makeDesktopItem, mkDerivation }:
let
version = "1.1.5-1";
version = "1.1.6-1";
description = ''
An application that runs on your computer in the background and seamlessly encrypts
@ -20,16 +20,15 @@ let
genericName = "ProtonMail Bridge for Linux";
categories = "Utility;Security;Network;Email";
};
in stdenv.mkDerivation rec {
in mkDerivation rec {
name = "protonmail-bridge-${version}";
src = fetchurl {
url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb";
sha256 = "1y5mphrs60zd6km9z64vskk70q9zzw4g6js7qvgl572wv81w2l75";
sha256 = "108dql9q5znsqjkrs41pc6psjbg5bz09rdmjl036xxbvsdvq4a8r";
};
nativeBuildInputs = [ wrapQtAppsHook ];
sourceRoot = ".";
unpackCmd = ''
@ -51,6 +50,8 @@ in stdenv.mkDerivation rec {
rpath = lib.makeLibraryPath [
stdenv.cc.cc.lib
qtbase
qtquickcontrols2
qtgraphicaleffects
qtmultimedia
qtsvg
qtdeclarative
@ -67,6 +68,8 @@ in stdenv.mkDerivation rec {
$out/lib/protonmail-bridge
'';
buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative ];
meta = with stdenv.lib; {
homepage = "https://www.protonmail.com/bridge";
license = licenses.mit;

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

@ -19887,7 +19887,7 @@ in
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 { };