git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #68274 from lightdiscord/packages/protonmail-bridge-update-1-2-2-1

protonmail-bridge: 1.1.6-1 -> 1.2.2-1

commit41ac894ccc447752ad4423dbc3249a005f951c6d authorworldofpeace <worldofpeace@protonmail.ch> dateTue 17 Sep 2019, 13:38 (7 years ago) parent2fe617356625d2
1 file changed+9−18
pkgs/applications/networking/protonmail-bridge/default.nix+9−18
pkgs/applications/networking/protonmail-bridge/default.nix+9−18
@@ -1,8 +1,8 @@
11{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtsvg, qtdeclarative, qttools, qtgraphicaleffects, qtquickcontrols2, full
2−, libsecret, libGL, libpulseaudio, glib, wrapQtAppsHook, makeDesktopItem, mkDerivation }:
2+, libsecret, libGL, libpulseaudio, glib, wrapQtAppsHook, mkDerivation }:
33
44let
5− version = "1.1.6-1";
5+ version = "1.2.2-1";
66
77 description = ''
88 An application that runs on your computer in the background and seamlessly encrypts
@@ -10,24 +10,13 @@ let
1010
1111 To work, gnome-keyring service must be enabled.
1212 '';
13−
14− desktopItem = makeDesktopItem {
15− name = "protonmail-bridge";
16− exec = "protonmail-bridge";
17− icon = "protonmail-bridge";
18− comment = stdenv.lib.replaceStrings ["\n"] [" "] description;
19− desktopName = "ProtonMail Bridge";
20− genericName = "ProtonMail Bridge for Linux";
21− categories = "Utility;Security;Network;Email";
22− };
23−
2413in mkDerivation {
2514 pname = "protonmail-bridge";
2615 inherit version;
2716
2817 src = fetchurl {
2918 url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb";
30− sha256 = "108dql9q5znsqjkrs41pc6psjbg5bz09rdmjl036xxbvsdvq4a8r";
19+ sha256 = "16hfa07wdqcns79395wjdglg2cjyblqgz1hx8rl15qm7n5f24ckl";
3120 };
3221
3322 sourceRoot = ".";
@@ -37,12 +26,10 @@ in mkDerivation {
3726 '';
3827
3928 installPhase = ''
40− mkdir -p $out/{bin,lib,share/applications}
41− mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
29+ mkdir -p $out/{bin,lib,share}
4230
4331 cp -r usr/lib/protonmail/bridge/protonmail-bridge $out/lib
44− cp usr/share/icons/protonmail/ProtonMail_Bridge.svg $out/share/icons/hicolor/scalable/apps/protonmail-bridge.svg
45− cp ${desktopItem}/share/applications/* $out/share/applications
32+ cp -r usr/share $out
4633
4734 ln -s $out/lib/protonmail-bridge $out/bin/protonmail-bridge
4835 '';
@@ -67,6 +54,10 @@ in mkDerivation {
6754 --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
6855 --set-rpath "${rpath}" \
6956 $out/lib/protonmail-bridge
57+
58+ substituteInPlace $out/share/applications/ProtonMail_Bridge.desktop \
59+ --replace "/usr/" "$out/" \
60+ --replace "Exec=protonmail-bridge" "Exec=$out/bin/protonmail-bridge"
7061 '';
7162
7263 buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative ];