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

- Update protonmail-bridge 1.1.0-1 -> 1.1.1-1 (#56149)

Browse Source 
- fix segmentation fault by explicitly calling qt 5.11
This commit is contained in:
GRBurst 2019-02-28 21:34:15 +00:00 committed by xeji
parent 79bc38c1bc
commit 071ee21f97
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
libsecret, libGL, libpulseaudio, glib, makeWrapper, makeDesktopItem }: libsecret, libGL, libpulseaudio, glib, makeWrapper, makeDesktopItem }:
let let
version = "1.1.0-1"; version = "1.1.1-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
@ -12,9 +12,9 @@ let
''; '';
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "Desktop-Bridge"; name = "protonmail-bridge";
exec = "Desktop-Bridge"; exec = "protonmail-bridge";
icon = "desktop-bridge"; icon = "protonmail-bridge";
comment = stdenv.lib.replaceStrings ["\n"] [" "] description; comment = stdenv.lib.replaceStrings ["\n"] [" "] description;
desktopName = "ProtonMail Bridge"; desktopName = "ProtonMail Bridge";
genericName = "ProtonMail Bridge for Linux"; genericName = "ProtonMail Bridge for Linux";
@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
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 = "0l29z208krnd3dginc203m4p5dlmnxf08vpmbm9xzlckwmswizkb"; sha256 = "148syyz92yqxp2fw18fhflhmdrakxz7cc30va7h0pwysz97gni2p";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
@ -40,11 +40,11 @@ in stdenv.mkDerivation rec {
mkdir -p $out/{bin,lib,share/applications} mkdir -p $out/{bin,lib,share/applications}
mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
cp -r usr/lib/protonmail/bridge/Desktop-Bridge{,.sh} $out/lib cp -r usr/lib/protonmail/bridge/protonmail-bridge{,.sh} $out/lib
cp usr/share/icons/protonmail/Desktop-Bridge.svg $out/share/icons/hicolor/scalable/apps/desktop-bridge.svg cp usr/share/icons/protonmail/ProtonMail_Bridge.svg $out/share/icons/hicolor/scalable/apps/protonmail-bridge.svg
cp ${desktopItem}/share/applications/* $out/share/applications 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 postFixup = let
@ -66,9 +66,9 @@ in stdenv.mkDerivation rec {
patchelf \ patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${rpath}" \ --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 QT_PLUGIN_PATH "${qtPath qtbase.qtPluginPrefix}" \
--set QML_IMPORT_PATH "${qtPath qtbase.qtQmlPrefix}" \ --set QML_IMPORT_PATH "${qtPath qtbase.qtQmlPrefix}" \
--set QML2_IMPORT_PATH "${qtPath qtbase.qtQmlPrefix}" \ --set QML2_IMPORT_PATH "${qtPath qtbase.qtQmlPrefix}" \

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

@ -18951,7 +18951,7 @@ in
python = python3; python = python3;
} // (config.profanity or {})); } // (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 { }; psi = callPackage ../applications/networking/instant-messengers/psi { };