Unverified Commit ec36d701 authored by Dixon Sean Low Yan Feng's avatar Dixon Sean Low Yan Feng
Browse files

mullvad-vpn: add binaries to PATH for GUI launcher script

Adds coreutils and gnugrep to the PATH of the GUI launcher script
via makeProgram. The launcher uses grep, echo, dirname and pwd.
parent 179bff39
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
, alsa-lib, atk, cairo, cups, dbus, expat, fontconfig, freetype
, gdk-pixbuf, glib, pango, nspr, nss, gtk3, mesa
, libGL, wayland, xorg, autoPatchelfHook, systemd, libnotify, libappindicator
, makeWrapper
, makeWrapper, coreutils, gnugrep
}:

let deps = [
@@ -77,7 +77,9 @@ stdenv.mkDerivation rec {
    ln -s $out/share/mullvad/mullvad-{gui,vpn} $out/bin/
    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
    wrapProgram $out/bin/mullvad-vpn \
      --set MULLVAD_DISABLE_UPDATE_NOTIFICATION 1 \
      --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]}

    wrapProgram $out/bin/mullvad-daemon \
        --set-default MULLVAD_RESOURCE_DIR "$out/share/mullvad/resources"