git.iko.soy/typeable/nixpkgs
on master help sign in
protonmail-bridge: 1.1.5 -> 1.1.6
commitc4cebed811f8e10a5c94f1fd559df65d0265e5fc authorGRBurst <GRBurst@protonmail.com> dateTue 23 Jul 2019, 22:11 (7 years ago) parentb4522d2
2 files changed+11−8
pkgs/applications/networking/protonmail-bridge/default.nix+10−7 pkgs/top-level/all-packages.nix+1−1
pkgs/applications/networking/protonmail-bridge/default.nix+10−7
@@ -1,8 +1,8 @@
1−{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtsvg, qtdeclarative, qttools, full
2−, libsecret, libGL, libpulseaudio, glib, wrapQtAppsHook, makeDesktopItem }:
1+{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtsvg, qtdeclarative, qttools, qtgraphicaleffects, qtquickcontrols2, full
2+, libsecret, libGL, libpulseaudio, glib, wrapQtAppsHook, makeDesktopItem, mkDerivation }:
33
44let
5− version = "1.1.5-1";
5+ version = "1.1.6-1";
66
77 description = ''
88 An application that runs on your computer in the background and seamlessly encrypts
@@ -20,16 +20,15 @@ let
2020 genericName = "ProtonMail Bridge for Linux";
2121 categories = "Utility;Security;Network;Email";
2222 };
23−in stdenv.mkDerivation rec {
23+
24+in mkDerivation rec {
2425 name = "protonmail-bridge-${version}";
2526
2627 src = fetchurl {
2728 url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb";
28− sha256 = "1y5mphrs60zd6km9z64vskk70q9zzw4g6js7qvgl572wv81w2l75";
29+ sha256 = "108dql9q5znsqjkrs41pc6psjbg5bz09rdmjl036xxbvsdvq4a8r";
2930 };
3031
31− nativeBuildInputs = [ wrapQtAppsHook ];
32−
3332 sourceRoot = ".";
3433
3534 unpackCmd = ''
@@ -51,6 +50,8 @@ in stdenv.mkDerivation rec {
5150 rpath = lib.makeLibraryPath [
5251 stdenv.cc.cc.lib
5352 qtbase
53+ qtquickcontrols2
54+ qtgraphicaleffects
5455 qtmultimedia
5556 qtsvg
5657 qtdeclarative
@@ -67,6 +68,8 @@ in stdenv.mkDerivation rec {
6768 $out/lib/protonmail-bridge
6869 '';
6970
71+ buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative ];
72+
7073 meta = with stdenv.lib; {
7174 homepage = "https://www.protonmail.com/bridge";
7275 license = licenses.mit;
pkgs/top-level/all-packages.nix+1−1
@@ -19869,7 +19869,7 @@ in
1986919869
1987019870 properties-cpp = callPackage ../development/libraries/properties-cpp { };
1987119871
19872− protonmail-bridge = libsForQt511.callPackage ../applications/networking/protonmail-bridge { };
19872+ protonmail-bridge = libsForQt512.callPackage ../applications/networking/protonmail-bridge { };
1987319873
1987419874 protonvpn-cli = callPackage ../applications/networking/protonvpn-cli { };
1987519875