diff options
| author | Oleksii Filonenko <github@brightone.cloud> | 2023-05-21 23:08:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-21 23:08:18 +0300 |
| commit | d967405bacda86b4608a9e141177c614aa081043 (patch) | |
| tree | 455431fb9e99c1bf404a6676f5ffb9bcb7df3b6d /pkgs/applications/networking/mullvad-vpn | |
| parent | 341258203eaa84f89646e136ac34736fd8bcfdf2 (diff) | |
| parent | 9dcb0f711272f2abde6d0e0e55f419aeacd82d8d (diff) | |
| download | nixpkgs-d967405bacda86b4608a9e141177c614aa081043.tar nixpkgs-d967405bacda86b4608a9e141177c614aa081043.tar.gz nixpkgs-d967405bacda86b4608a9e141177c614aa081043.tar.bz2 nixpkgs-d967405bacda86b4608a9e141177c614aa081043.tar.lz nixpkgs-d967405bacda86b4608a9e141177c614aa081043.tar.xz nixpkgs-d967405bacda86b4608a9e141177c614aa081043.tar.zst nixpkgs-d967405bacda86b4608a9e141177c614aa081043.zip | |
Merge pull request #217167 from PlayerNameHere/mullvad-vpn-substitute-programs
mullvad-vpn: add binaries to PATH for GUI launcher script
Diffstat (limited to 'pkgs/applications/networking/mullvad-vpn')
| -rw-r--r-- | pkgs/applications/networking/mullvad-vpn/default.nix | 39 |
1 files changed, 33 insertions, 6 deletions
diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 6b505f41560..56842796e1e 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 +{ 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 @@ -77,7 +102,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" |