chore(nym-vpn-app): resync with main

.github/workflows/build-nym-vpn-app-windows.yml

@@ -7,13 +7,20 @@ on:
         required: true
         type: boolean
         default: false
+      core_release_tag:
+        description: "nym-vpn-core release tag to use for Windows build (as it bundles the daemon)"
+        required: false
+        type: string
   workflow_call:
     inputs:
       # set to true when it is a 'dev' build
       dev_mode:
         required: true
         type: boolean
         default: false
+      core_release_tag:
+        required: false
+        type: string
     secrets:
       WINDOWS_SIGNING_PFX_BASE64:
         required: true
@@ -128,7 +135,13 @@ jobs:
           winget list MikeFarah.yq || winget install --disable-interactivity --id MikeFarah.yq
 
       - name: Get nym-vpn-core release tag
-        if: inputs.dev_mode == false
+        if: inputs.core_release_tag
+        run: |
+          echo "core_release_tag: ${{ inputs.core_release_tag }}"
+          "core_release_tag=${{ inputs.core_release_tag }}" >> $env:GITHUB_ENV
+
+      - name: Get nym-vpn-core release tag
+        if: ${{ !inputs.core_release_tag && !inputs.dev_mode }}
         run: |
           $release_tag = curl -sSL -H "Accept: application/vnd.github+json" `
             https://api.github.com/repos/nymtech/nym-vpn-client/releases |
@@ -137,7 +150,7 @@ jobs:
           "core_release_tag=$release_tag" >> $env:GITHUB_ENV
 
       - name: Get nym-vpn-core release tag (dev)
-        if: inputs.dev_mode == true
+        if: ${{ !inputs.core_release_tag && inputs.dev_mode }}
         run: |
           echo "core_release_tag: nym-vpn-core-nightly"
           "core_release_tag=nym-vpn-core-nightly" >> $env:GITHUB_ENV

.github/workflows/publish-nym-vpn-app.yml

@@ -13,6 +13,10 @@ on:
         required: true
         type: boolean
         default: false
+      core_release_tag:
+        description: "nym-vpn-core release tag to use for Windows build (as it bundles the daemon)"
+        required: false
+        type: string
   push:
     tags:
       - nym-vpn-app-v[0-9]+.[0-9]+.[0-9]+*
@@ -27,6 +31,7 @@ jobs:
     uses: ./.github/workflows/build-nym-vpn-app-windows.yml
     with:
       dev_mode: ${{ github.event_name == 'schedule' || contains(github.ref_name, 'dev') || contains(github.ref_name, 'nightly') || inputs.dev_mode == true  }}
+      core_release_tag: ${{ inputs.core_release_tag }}
     secrets: inherit
 
   generate-build-info-nym-vpn-app:

nym-vpn-app/.pkg/app.desktop

@@ -3,7 +3,7 @@ Name=NymVPN
 Type=Application
 Version=1.0
 Comment=Decentralized, mixnet, and zero-knowledge VPN
-Exec=run.sh %U
+Exec=env LOG_FILE=1 RUST_LOG=info,nym_vpn_app=debug nym-vpn-app %U
 Icon=nym-vpn
 Terminal=false
 Categories=Network;

nym-vpn-app/.pkg/aur/PKGBUILD

@@ -18,7 +18,6 @@ provides=('nym-vpn-app')
 conflicts=('nymvpn-x' 'nym-vpn-app')
 options=(!debug)
 source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$_release_tag.tar.gz"
-    'nym-vpn-wrapper.sh'
     'nym-vpn.desktop'
     'nym-vpn.svg')
 sha256sums=()
@@ -27,7 +26,7 @@ _srcdir="nym-vpn-client-$_release_tag"
 prepare() {
   pushd "$_srcdir"
 
-  # rip off all useless sources
+  # rip off useless sources
   rm -rf nym-vpn-android
   rm -rf nym-vpn-apple
   popd
@@ -58,8 +57,7 @@ package() {
   install -Dm755 "src-tauri/target/release/nym-vpn-app" "$pkgdir/usr/bin/nym-vpn-app"
   popd
 
-  install -Dm755 "nym-vpn-wrapper.sh" "$pkgdir/usr/bin/nym-vpn-wrapper.sh"
-  install -Dm644 "nym-vpn.desktop"    "$pkgdir/usr/share/applications/nym-vpn.desktop"
-  install -Dm644 "nym-vpn.svg"        "$pkgdir/usr/share/icons/nym-vpn.svg"
+  install -Dm644 "nym-vpn.desktop" "$pkgdir/usr/share/applications/nym-vpn.desktop"
+  install -Dm644 "nym-vpn.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/nym-vpn.svg"
 }
 

nym-vpn-app/.pkg/aur/PKGBUILD-bin

@@ -18,15 +18,14 @@ provides=('nym-vpn-app')
 conflicts=('nymvpn-x' 'nym-vpn-app')
 options=(!debug)
 source=("$url/releases/download/$_release_tag/nym-vpn_${_pkgver}_linux_x64"
-    'nym-vpn-wrapper.sh'
     'nym-vpn.desktop'
     'nym-vpn.svg')
 sha256sums=()
 
 package() {
   install -Dm755 "nym-vpn_${_pkgver}_linux_x64" "$pkgdir/usr/bin/nym-vpn-app"
-  install -Dm755 "nym-vpn-wrapper.sh" "$pkgdir/usr/bin/nym-vpn-wrapper.sh"
-  install -Dm644 "nym-vpn.desktop"    "$pkgdir/usr/share/applications/nym-vpn.desktop"
-  install -Dm644 "nym-vpn.svg"        "$pkgdir/usr/share/icons/nym-vpn.svg"
+  install -Dm644 "nym-vpn.desktop" "$pkgdir/usr/share/applications/nym-vpn.desktop"
+  install -Dm644 "nym-vpn.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/nym-vpn.svg"
 }
 
+

nym-vpn-app/.pkg/flatpak/net.nymtech.NymVPN.yml

@@ -28,23 +28,12 @@ modules:
         path: net.nymtech.NymVPN.metainfo.xml
       - type: file
         path: ../app.desktop
-      - type: script
-        dest-filename: run.sh
-        # wrapper script to set the needed environment variables
-        commands:
-          # use `WEBKIT_DISABLE_DMABUF_RENDERER=1` to fix an issue with NVIDIA gpu
-          # https://github.com/nymtech/nym-vpn-client/issues/305
-          - |
-            if [ -c /dev/nvidia0 ]; then
-              export WEBKIT_DISABLE_DMABUF_RENDERER=1
-            fi
-            LOG_FILE=1 /app/bin/nym-vpn "$@"
       - type: file
         path: ../icon.svg
     build-commands:
       - install -Dm755 nym-vpn /app/bin/nym-vpn
-      - install -Dm755 run.sh /app/bin/run.sh
-      - sed -i "s/^Icon=.*/Icon=net.nymtech.NymVPN/" app.desktop
+      - desktop-file-edit --set-key=Exec --set-value='env LOG_FILE=1 RUST_LOG=info nym-vpn %U' app.desktop
+      - desktop-file-edit --set-icon=net.nymtech.NymVPN app.desktop
       - install -Dm644 app.desktop /app/share/applications/net.nymtech.NymVPN.desktop
       - install -Dm644 icon.svg /app/share/icons/hicolor/scalable/apps/net.nymtech.NymVPN.svg
       - install -Dm644 net.nymtech.NymVPN.metainfo.xml /app/share/metainfo/net.nymtech.NymVPN.metainfo.xml

nym-vpn-app/README.md

@@ -1,14 +1,14 @@
 # nym-vpn-app
 
 Desktop client application for [NymVPN](https://nymvpn.com/en), built with
-[tauri](https://v2.tauri.app/).
+[tauri](https://v2.tauri.app/). Supports Linux and Windows.
 
-For more information about NymVPN, its features, latest announcements, Help Center, or to download the latest stable release, visit [nymvpn.com](https://nymvpn.com/en).
+For more information about NymVPN, its features, latest announcements,
+Help Center, or to download the latest stable release, visit
+[nymvpn.com](https://nymvpn.com/en).
 
 ## Installation
 
-### Linux
-
 The following install methods are available:
 
 ### Arch Linux (AUR)
@@ -39,26 +39,25 @@ sudo dpkg -i /tmp/nym-repo-setup_1.0.1_amd64.deb
 sudo apt install nym-vpn
 ```
 
-### Other Linux
+### Flatpak (client app only)
 
-For most Linux distributions, you can install both the client
-application and the daemon (`vpnd`) via the installer script:
+The app is available on [Flathub](https://flathub.org/apps/net.nymtech.NymVPN)
 
 ```shell
-curl -fsSL https://nymtech.net/go/github/nym-vpn-client/raw/main/.pkg/linux/install | bash
+flatpak install flathub net.nymtech.NymVPN
 ```
 
-It will install from the latest releases the client as AppImage
-and the daemon as a systemd service.
+### AppImage (client app only)
 
-note: it's a good practice to check the
-[script](https://github.com/nymtech/nym-vpn-client/blob/main/.pkg/linux/install)
-before running it.
+The _AppImage_ is available in the
+[releases](https://github.com/nymtech/nym-vpn-client/releases),
+look for release tag `nym-vpn-app-v*` and download `NymVPN.AppImage`.
 
 ### Windows
 
-Download the installer from the [releases](https://github.com/nymtech/nym-vpn-client/releases).\
-Look for the latest release `nym-vpn-app-v*`, download
+The installer is available in the
+[releases](https://github.com/nymtech/nym-vpn-client/releases).\
+Look for release tag `nym-vpn-app-v*`, download
 `NymVPN-setup.exe` and launch it.
 
 ---