Merge pull request #83621 from cgevans/fix-mullvad-appindicator2

mullvad-vpn: add libappindicator dependency and fix mullvad-problem-report link
This commit is contained in:
Mario Rodas 2020-04-01 08:16:51 -05:00 committed by GitHub
commit 9644e10968
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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
@ -74,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
'';