From 071ee21f97cf8667702fae4757bbb20e5c6ceecf Mon Sep 17 00:00:00 2001
From: GRBurst <GRBurst@users.noreply.github.com>
Date: Thu, 28 Feb 2019 21:34:15 +0000
Subject: [PATCH] - Update protonmail-bridge 1.1.0-1 -> 1.1.1-1 (#56149)

- fix segmentation fault by explicitly calling qt 5.11
---
 .../networking/protonmail-bridge/default.nix  | 20 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix
index 3e74fbfb66a..7557f04dc58 100644
--- a/pkgs/applications/networking/protonmail-bridge/default.nix
+++ b/pkgs/applications/networking/protonmail-bridge/default.nix
@@ -2,7 +2,7 @@
   libsecret, libGL, libpulseaudio, glib, makeWrapper, makeDesktopItem }:
 
 let
-  version = "1.1.0-1";
+  version = "1.1.1-1";
 
   description = ''
     An application that runs on your computer in the background and seamlessly encrypts
@@ -12,9 +12,9 @@ let
   '';
 
   desktopItem = makeDesktopItem {
-    name = "Desktop-Bridge";
-    exec = "Desktop-Bridge";
-    icon = "desktop-bridge";
+    name = "protonmail-bridge";
+    exec = "protonmail-bridge";
+    icon = "protonmail-bridge";
     comment = stdenv.lib.replaceStrings ["\n"] [" "] description;
     desktopName = "ProtonMail Bridge";
     genericName = "ProtonMail Bridge for Linux";
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb";
-    sha256 = "0l29z208krnd3dginc203m4p5dlmnxf08vpmbm9xzlckwmswizkb";
+    sha256 = "148syyz92yqxp2fw18fhflhmdrakxz7cc30va7h0pwysz97gni2p";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -40,11 +40,11 @@ in stdenv.mkDerivation rec {
     mkdir -p $out/{bin,lib,share/applications}
     mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
 
-    cp -r usr/lib/protonmail/bridge/Desktop-Bridge{,.sh} $out/lib
-    cp usr/share/icons/protonmail/Desktop-Bridge.svg $out/share/icons/hicolor/scalable/apps/desktop-bridge.svg
+    cp -r usr/lib/protonmail/bridge/protonmail-bridge{,.sh} $out/lib
+    cp usr/share/icons/protonmail/ProtonMail_Bridge.svg $out/share/icons/hicolor/scalable/apps/protonmail-bridge.svg
     cp ${desktopItem}/share/applications/* $out/share/applications
 
-    ln -s $out/lib/Desktop-Bridge $out/bin/Desktop-Bridge
+    ln -s $out/lib/protonmail-bridge $out/bin/protonmail-bridge
   '';
 
   postFixup = let
@@ -66,9 +66,9 @@ in stdenv.mkDerivation rec {
     patchelf \
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       --set-rpath "${rpath}" \
-      $out/lib/Desktop-Bridge
+      $out/lib/protonmail-bridge
 
-    wrapProgram $out/lib/Desktop-Bridge \
+    wrapProgram $out/lib/protonmail-bridge \
       --set QT_PLUGIN_PATH "${qtPath qtbase.qtPluginPrefix}" \
       --set QML_IMPORT_PATH "${qtPath qtbase.qtQmlPrefix}" \
       --set QML2_IMPORT_PATH "${qtPath qtbase.qtQmlPrefix}" \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d6a06d651e..4ef0f40e4c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18951,7 +18951,7 @@ in
     python = python3;
   } // (config.profanity or {}));
 
-  protonmail-bridge = libsForQt5.callPackage ../applications/networking/protonmail-bridge { };
+  protonmail-bridge = libsForQt511.callPackage ../applications/networking/protonmail-bridge { };
 
   psi = callPackage ../applications/networking/instant-messengers/psi { };