nixos-config/patches/ivpn-ui.patch

134 lines
4.0 KiB
Diff
Raw Normal View History

2023-04-25 17:45:06 +03:00
From 0683c927678c97d998d9363b1a0b997db5cabae3 Mon Sep 17 00:00:00 2001
From: Dmitriy Kholkin <ataraxiadev@ataraxiadev.com>
Date: Sun, 16 Apr 2023 22:24:20 +0300
Subject: [PATCH] ivpn-ui: init at 3.10.14
---
pkgs/tools/networking/ivpn-ui/default.nix | 103 ++++++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 +
2 files changed, 105 insertions(+)
create mode 100644 pkgs/tools/networking/ivpn-ui/default.nix
2023-04-16 22:40:20 +03:00
diff --git a/pkgs/tools/networking/ivpn-ui/default.nix b/pkgs/tools/networking/ivpn-ui/default.nix
new file mode 100644
2023-04-25 17:45:06 +03:00
index 0000000000000..fcaae31d3d584
2023-04-16 22:40:20 +03:00
--- /dev/null
+++ b/pkgs/tools/networking/ivpn-ui/default.nix
2023-04-25 17:45:06 +03:00
@@ -0,0 +1,103 @@
2023-04-16 22:40:20 +03:00
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+, nodejs-16_x
2023-04-25 17:45:06 +03:00
+, electron_24
2023-04-16 22:40:20 +03:00
+, jq
+, makeWrapper
+, makeDesktopItem
2023-04-25 17:45:06 +03:00
+, copyDesktopItems
+, ivpn
+, openssl
+, glib
2023-04-16 22:40:20 +03:00
+}:
+
+let
+ buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs-16_x; };
2023-04-25 17:45:06 +03:00
+ electron = electron_24;
2023-04-16 22:40:20 +03:00
+
+ desktopItem = makeDesktopItem {
+ name = "IVPN";
+ desktopName = "IVPN";
+ comment = "UI interface for IVPN";
+ genericName = "VPN client";
+ exec = "ivpn-ui";
2023-04-25 17:45:06 +03:00
+ icon = "ivpn";
2023-04-16 22:40:20 +03:00
+ type = "Application";
+ startupNotify = true;
+ categories = [ "Network" ];
+ };
+in buildNpmPackage' rec {
+ pname = "ivpn-ui";
+ version = "3.10.14";
+
+ src = fetchFromGitHub {
+ owner = "ivpn";
+ repo = "desktop-app";
+ rev = "v${version}";
+ hash = "sha256-zHBjAEVHjnHMuUutwQQCCcZ7+Fz3C4GCAV3/jgZgwhM=";
+ };
+
+ env = {
+ ELECTRON_OVERRIDE_DIST_PATH = "${electron}/bin";
+ ELECTRON_CACHE = ".cache/electron";
+ ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+ NODE_OPTIONS = "--openssl-legacy-provider";
+ };
+
+ npmBuildScript = "electron:build";
+ npmDepsHash = "sha256-U7Jurq7Dv9oRZushf8yeHuqe3pKTBJ/9hpS/iQzIYkI=";
+
+ sourceRoot = "source/ui";
+
+ nativeBuildInputs = [
+ jq
+ makeWrapper
2023-04-25 17:45:06 +03:00
+ copyDesktopItems
2023-04-16 22:40:20 +03:00
+ ];
+
2023-04-25 17:45:06 +03:00
+ desktopItems = [ desktopItem ];
2023-04-16 22:40:20 +03:00
+
+ # electron-builder attempts to download Electron frow web,
+ # so we need to provide a zipped version of Electron.
2023-04-25 17:45:06 +03:00
+ # The version of Electron that we provide may differ from the one
2023-04-16 22:40:20 +03:00
+ # in the package-lock.json file, but it should not cause any problems.
+ preBuild = ''
+ mkdir -p .cache/electron
+ ln -sf ${electron.src} .cache/electron/electron-v$(jq -r '.devDependencies.electron' package.json)-linux-x64.zip
2023-04-25 17:45:06 +03:00
+
+ substituteInPlace src/daemon-client/index.js \
+ --replace "/usr/bin/gsettings" "${glib}/bin/gsettings" \
+ --replace "/usr/bin/ivpn exclude" "${ivpn}/bin/ivpn exclude"
+
+ substituteInPlace src/helpers/main_platform.js \
+ --replace "/usr/bin/openssl" "${openssl}/bin/openssl"
2023-04-16 22:40:20 +03:00
+ '';
+
+ installPhase = ''
+ runHook preInstall
+
2023-04-25 17:45:06 +03:00
+ mkdir -p $out/bin $out/opt/ivpn-ui $out/share/icons/hicolor/scalable/apps
2023-04-16 22:40:20 +03:00
+
+ pushd dist_electron/linux-unpacked
+ cp -r locales resources $out/opt/ivpn-ui
+ cp ivpn-ui $out/bin
+ popd
+
2023-04-25 17:45:06 +03:00
+ cp References/Linux/ui/ivpnicon.svg $out/share/icons/hicolor/scalable/apps/ivpn.svg
2023-04-16 22:40:20 +03:00
+
+ makeWrapper '${electron}/bin/electron' "$out/bin/ivpn-ui" \
+ --add-flags $out/opt/ivpn-ui/resources/app.asar \
+ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
+
+ runHook postInstall
+ '';
+
+ meta = with lib; {
+ description = "Official IVPN Desktop app";
+ homepage = "https://www.ivpn.net/apps";
+ changelog = "https://github.com/ivpn/desktop-app/releases/tag/v${version}";
+ license = licenses.gpl3Only;
+ maintainers = with maintainers; [ ataraxiasjel ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
2023-04-25 17:45:06 +03:00
index 73594265adf1e..dae1f0318a7f4 100644
2023-04-16 22:40:20 +03:00
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
2023-04-25 17:45:06 +03:00
@@ -1558,6 +1558,8 @@ with pkgs;
2023-04-16 22:40:20 +03:00
inherit (callPackage ../tools/networking/ivpn/default.nix {}) ivpn ivpn-service;
+ ivpn-ui = callPackage ../tools/networking/ivpn-ui { };
+
jobber = callPackage ../tools/system/jobber { };
kanata = callPackage ../tools/system/kanata { };