diff options
| author | Bernardo Meurer <bernardo@meurer.org> | 2022-01-26 10:22:59 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-26 10:22:59 -0800 |
| commit | ad79594d1e2fea66bf7d5faeec6ef35319596031 (patch) | |
| tree | 64765f728d56b93943ba700f59da0383b4fa94a2 | |
| parent | d843a692aef0605469a7d16744eb433857145d58 (diff) | |
| parent | 76c35ec8391401d83bc41a515f1199ce6ab04c1d (diff) | |
Merge pull request #156432 from lovesegfault/mullvad-wrapper
mullvad-vpn: use makeWrapper instead of env hack
| -rw-r--r-- | pkgs/applications/networking/mullvad-vpn/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index fd08817f026d..c196f6bdbda9 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -2,6 +2,7 @@ , alsa-lib, atk, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3, mesa , xorg, autoPatchelfHook, systemd, libnotify, libappindicator +, makeWrapper }: let deps = [ @@ -53,6 +54,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook dpkg + makeWrapper ]; buildInputs = deps; @@ -73,12 +75,14 @@ stdenv.mkDerivation rec { mv usr/bin/* $out/bin mv opt/Mullvad\ VPN/* $out/share/mullvad - sed -i 's|"\/opt\/Mullvad.*VPN|env MULLVAD_DISABLE_UPDATE_NOTIFICATION=1 "'$out'/bin|g' $out/share/applications/mullvad-vpn.desktop - 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 + wrapProgram $out/bin/mullvad-vpn --set MULLVAD_DISABLE_UPDATE_NOTIFICATION 1 + + sed -i "s|Exec.*$|Exec=$out/bin/mullvad-vpn $U|" $out/share/applications/mullvad-vpn.desktop + runHook postInstall ''; |