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

protonmail-bridge: use archive desktop file

Browse Source
This commit is contained in:
LightDiscord 2019-09-08 11:50:05 +02:00
parent c4ae600ae3
commit 56625d224f
No known key found for this signature in database
GPG Key ID: 5C3447007FAAB965
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtsvg, qtdeclarative, qttools, qtgraphicaleffects, qtquickcontrols2, full { stdenv, fetchurl, lib, qtbase, qtmultimedia, qtsvg, qtdeclarative, qttools, qtgraphicaleffects, qtquickcontrols2, full
, libsecret, libGL, libpulseaudio, glib, wrapQtAppsHook, makeDesktopItem, mkDerivation }: , libsecret, libGL, libpulseaudio, glib, wrapQtAppsHook, mkDerivation }:
let let
version = "1.2.2-1"; version = "1.2.2-1";
@ -10,17 +10,6 @@ let
To work, gnome-keyring service must be enabled. To work, gnome-keyring service must be enabled.
''; '';
desktopItem = makeDesktopItem {
name = "protonmail-bridge";
exec = "protonmail-bridge";
icon = "protonmail-bridge";
comment = stdenv.lib.replaceStrings ["\n"] [" "] description;
desktopName = "ProtonMail Bridge";
genericName = "ProtonMail Bridge for Linux";
categories = "Utility;Security;Network;Email";
};
in mkDerivation { in mkDerivation {
pname = "protonmail-bridge"; pname = "protonmail-bridge";
inherit version; inherit version;
@ -37,12 +26,10 @@ in mkDerivation {
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/{bin,lib,share/applications} mkdir -p $out/{bin,lib,share}
mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
cp -r usr/lib/protonmail/bridge/protonmail-bridge $out/lib cp -r usr/lib/protonmail/bridge/protonmail-bridge $out/lib
cp usr/share/icons/protonmail/ProtonMail_Bridge.svg $out/share/icons/hicolor/scalable/apps/protonmail-bridge.svg cp -r usr/share $out
cp ${desktopItem}/share/applications/* $out/share/applications
ln -s $out/lib/protonmail-bridge $out/bin/protonmail-bridge ln -s $out/lib/protonmail-bridge $out/bin/protonmail-bridge
''; '';
@ -67,6 +54,10 @@ in mkDerivation {
--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/protonmail-bridge $out/lib/protonmail-bridge
substituteInPlace $out/share/applications/ProtonMail_Bridge.desktop \
--replace "/usr/" "$out/" \
--replace "Exec=protonmail-bridge" "Exec=$out/bin/protonmail-bridge"
''; '';
buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative ]; buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative ];