diff options
author | LightDiscord <root@arnaud.sh> | 2019-09-08 11:50:05 +0200 |
---|---|---|
committer | LightDiscord <root@arnaud.sh> | 2019-09-08 11:50:05 +0200 |
commit | 56625d224f366ea76b279162f46404b7ec5a9f50 (patch) | |
tree | 74474a44d568d23851283c151f7c0aea6d2dbbb1 /pkgs/applications/networking/protonmail-bridge | |
parent | c4ae600ae370dfe8bc08b2467cc648dd0ac10fd5 (diff) | |
download | nixlib-56625d224f366ea76b279162f46404b7ec5a9f50.tar nixlib-56625d224f366ea76b279162f46404b7ec5a9f50.tar.gz nixlib-56625d224f366ea76b279162f46404b7ec5a9f50.tar.bz2 nixlib-56625d224f366ea76b279162f46404b7ec5a9f50.tar.lz nixlib-56625d224f366ea76b279162f46404b7ec5a9f50.tar.xz nixlib-56625d224f366ea76b279162f46404b7ec5a9f50.tar.zst nixlib-56625d224f366ea76b279162f46404b7ec5a9f50.zip |
protonmail-bridge: use archive desktop file
Diffstat (limited to 'pkgs/applications/networking/protonmail-bridge')
-rw-r--r-- | pkgs/applications/networking/protonmail-bridge/default.nix | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index 861cff3fbfdc..a585e7f948bb 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -1,5 +1,5 @@ { 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 version = "1.2.2-1"; @@ -10,17 +10,6 @@ let 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 { pname = "protonmail-bridge"; inherit version; @@ -37,12 +26,10 @@ in mkDerivation { ''; installPhase = '' - mkdir -p $out/{bin,lib,share/applications} - mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} + mkdir -p $out/{bin,lib,share} 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 ${desktopItem}/share/applications/* $out/share/applications + cp -r usr/share $out 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-rpath "${rpath}" \ $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 ]; |