From 061e73c9592935e5f6ac11622dca8e041d7561c7 Mon Sep 17 00:00:00 2001
From: Constantine Glen Evans <cevans@evanslabs.org>
Date: Sat, 28 Mar 2020 13:45:23 -0700
Subject: mullvad-vpn: add libappindicator dependency

Adding libappindicator as a runtime dependency allows the Electron-based gui app
to have an appindicator in desktop environments that support them (eg,
Gnome with the appindicator support extension).
---
 pkgs/applications/networking/mullvad-vpn/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'pkgs/applications/networking')

diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix
index 3b7de8360d74..fbefa871e7fa 100644
--- a/pkgs/applications/networking/mullvad-vpn/default.nix
+++ b/pkgs/applications/networking/mullvad-vpn/default.nix
@@ -1,7 +1,7 @@
 { stdenv, makeWrapper, fetchurl, dpkg
 , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype
 , gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3
-, xorg, autoPatchelfHook, systemd, libnotify
+, xorg, autoPatchelfHook, systemd, libnotify, libappindicator
 }:
 
 let deps = [
@@ -18,6 +18,7 @@ let deps = [
     gnome2.GConf
     pango
     gtk3
+    libappindicator
     libnotify
     xorg.libX11
     xorg.libXScrnSaver
@@ -59,7 +60,7 @@ stdenv.mkDerivation rec {
 
   unpackPhase = "dpkg-deb -x $src .";
 
-  runtimeDependencies = [ systemd.lib libnotify ];
+  runtimeDependencies = [ systemd.lib libnotify libappindicator ];
 
   installPhase = ''
     runHook preInstall
-- 
cgit 1.4.1


From 1eacf626edcbdc241854f795875717de616b66a3 Mon Sep 17 00:00:00 2001
From: Constantine Glen Evans <cevans@evanslabs.org>
Date: Sat, 28 Mar 2020 14:24:24 -0700
Subject: mullvad-vpn: fix mullvad-problem-report link

---
 pkgs/applications/networking/mullvad-vpn/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pkgs/applications/networking')

diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix
index fbefa871e7fa..2e4e4c732868 100644
--- a/pkgs/applications/networking/mullvad-vpn/default.nix
+++ b/pkgs/applications/networking/mullvad-vpn/default.nix
@@ -75,6 +75,7 @@ stdenv.mkDerivation rec {
 
     ln -s $out/share/mullvad/mullvad-{gui,vpn} $out/bin/
     ln -s $out/share/mullvad/resources/mullvad-daemon $out/bin/mullvad-daemon
+    ln -sf $out/share/mullvad/resources/mullvad-problem-report $out/bin/mullvad-problem-report
 
     runHook postInstall
   '';
-- 
cgit 1.4.1