From c4cebed811f8e10a5c94f1fd559df65d0265e5fc Mon Sep 17 00:00:00 2001
From: GRBurst <GRBurst@protonmail.com>
Date: Tue, 23 Jul 2019 22:11:28 +0200
Subject: [PATCH] protonmail-bridge: 1.1.5 -> 1.1.6
---
.../networking/protonmail-bridge/default.nix | 17 ++++++++++-------
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix
index 807b8116b46f..c685a2705862 100644
--- a/pkgs/applications/networking/protonmail-bridge/default.nix
+++ b/pkgs/applications/networking/protonmail-bridge/default.nix
@@ -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;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e1a45d4e45a2..be618dc06b2d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19869,7 +19869,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 { };