From ec36d701273059eecdf1290e4a206068fa7da5e0 Mon Sep 17 00:00:00 2001
From: Dixon Sean Low Yan Feng <dixonseanlow@protonmail.com>
Date: Mon, 20 Feb 2023 19:38:20 +0800
Subject: [PATCH 1/2] 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.
---
 pkgs/applications/networking/mullvad-vpn/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix
index 1bda56c5420..4c437611d61 100644
--- a/pkgs/applications/networking/mullvad-vpn/default.nix
+++ b/pkgs/applications/networking/mullvad-vpn/default.nix
@@ -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"

From 9dcb0f711272f2abde6d0e0e55f419aeacd82d8d Mon Sep 17 00:00:00 2001
From: Dixon Sean Low Yan Feng <dixonseanlow@protonmail.com>
Date: Mon, 20 Feb 2023 19:50:07 +0800
Subject: [PATCH 2/2] mullvad-vpn: format with nixpkgs-fmt

---
 .../networking/mullvad-vpn/default.nix        | 37 ++++++++++++++++---
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix
index 4c437611d61..b55cb681a42 100644
--- a/pkgs/applications/networking/mullvad-vpn/default.nix
+++ b/pkgs/applications/networking/mullvad-vpn/default.nix
@@ -1,11 +1,36 @@
-{ stdenv, lib, fetchurl, dpkg
-, 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, coreutils, gnugrep
+{ stdenv
+, lib
+, fetchurl
+, dpkg
+, 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
+, coreutils
+, gnugrep
 }:
 
-let deps = [
+let
+  deps = [
     alsa-lib
     atk
     cairo