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

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

Browse Source 
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
parent dd1068f840 1eacf626ed
commit 9644e10968
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/mullvad-vpn/default.nix
+4 -2
View File
@@ -1,7 +1,7 @@
{ stdenv, makeWrapper, fetchurl, dpkg { stdenv, makeWrapper, fetchurl, dpkg
, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype
, gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3 , gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3
, xorg, autoPatchelfHook, systemd, libnotify , xorg, autoPatchelfHook, systemd, libnotify, libappindicator
}: }:
let deps = [ let deps = [
@@ -18,6 +18,7 @@ let deps = [
gnome2.GConf gnome2.GConf
pango pango
gtk3 gtk3
libappindicator
libnotify libnotify
xorg.libX11 xorg.libX11
xorg.libXScrnSaver xorg.libXScrnSaver
@@ -59,7 +60,7 @@ stdenv.mkDerivation rec {
unpackPhase = "dpkg-deb -x $src ."; unpackPhase = "dpkg-deb -x $src .";
runtimeDependencies = [ systemd.lib libnotify ]; runtimeDependencies = [ systemd.lib libnotify libappindicator ];
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
@@ -74,6 +75,7 @@ stdenv.mkDerivation rec {
ln -s $out/share/mullvad/mullvad-{gui,vpn} $out/bin/ ln -s $out/share/mullvad/mullvad-{gui,vpn} $out/bin/
ln -s $out/share/mullvad/resources/mullvad-daemon $out/bin/mullvad-daemon 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 runHook postInstall
''; '';