firezone-gui-client: 1.4.12 -> 1.5.1 (#414765)

nixos/modules/services/networking/firezone/gui-client.nix

@@ -6,7 +6,6 @@
 }:
 let
   inherit (lib)
-    boolToString
     getExe'
     mkEnableOption
     mkIf
@@ -28,7 +27,7 @@ in
         default = [ ];
         description = ''
           All listed users will become part of the `firezone-client` group so
-          they can control the IPC service. This is a convenience option.
+          they can control the tunnel service. This is a convenience option.
         '';
       };
 
@@ -58,8 +57,8 @@ in
     # Required for the token store in the gui application
     services.gnome.gnome-keyring.enable = true;
 
-    systemd.services.firezone-ipc-service = {
-      description = "GUI IPC service for the Firezone zero-trust access platform";
+    systemd.services.firezone-tunnel-service = {
+      description = "GUI tunnel service for the Firezone zero-trust access platform";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
 
@@ -73,7 +72,7 @@ in
           export FIREZONE_ID=$(< client_id)
         fi
 
-        exec ${getExe' cfg.package "firezone-client-ipc"} run
+        exec ${getExe' cfg.package "firezone-client-tunnel"} run
       '';
 
       environment = {

pkgs/by-name/fi/firezone-gui-client/package.nix

@@ -1,5 +1,6 @@
 {
   lib,
+  rust,
   rustPlatform,
   fetchFromGitHub,
   nix-update-script,
@@ -24,12 +25,12 @@
   copyDesktopItems,
 }:
 let
-  version = "1.4.12";
+  version = "1.5.1";
   src = fetchFromGitHub {
     owner = "firezone";
     repo = "firezone";
     tag = "gui-client-${version}";
-    hash = "sha256-jvrkAbXHFWdNInDCrktC7eMZQ2a/rzUxfCOny7nHQmQ=";
+    hash = "sha256-KozSy44Opx6cukA0QTXeMpI3fP49iyabFzPLIJckOZ4=";
   };
 
   frontend = stdenvNoCC.mkDerivation rec {
@@ -39,10 +40,12 @@ let
     pnpmDeps = pnpm_9.fetchDeps {
       inherit pname version;
       src = "${src}/rust/gui-client";
-      hash = "sha256-bVWpyGwEaxYi3N6BJqOilnHJDgAykKHgRC2QKlvSm4Q=";
+      hash = "sha256-ttbTYBuUv0vyiYzrFATF4x/zngsRXjuLPfL3qW2HEe4=";
     };
     pnpmRoot = "rust/gui-client";
 
+    env.GITHUB_SHA = version;
+
     nativeBuildInputs = [
       pnpm_9.configHook
       nodejs
@@ -52,8 +55,7 @@ let
       runHook preBuild
 
       cd $pnpmRoot
-      cp node_modules/flowbite/dist/flowbite.min.js src/
-      pnpm tailwindcss -i src/input.css -o src/output.css
+      node ./node_modules/flowbite-react/dist/cli/bin.js patch
       node --max_old_space_size=1024000 ./node_modules/vite/bin/vite.js build
 
       runHook postBuild
@@ -73,7 +75,7 @@ rustPlatform.buildRustPackage rec {
   inherit version src;
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-YETCRhECbMTRmNsvOFl7R2YScY6ArjsOYJKdPVuUyGI=";
+  cargoHash = "sha256-TDP1Z4MeQaSER8MGnCEQfIhRsakaSCeJ7boUMBYkkI0=";
   sourceRoot = "${src.name}/rust";
   buildAndTestSubdir = "gui-client";
   RUSTFLAGS = "--cfg system_certs";
@@ -102,6 +104,9 @@ rustPlatform.buildRustPackage rec {
   postPatch = ''
     rm .cargo/config.toml
     ln -s ${frontend} gui-client/dist
+
+    substituteInPlace gui-client/src-tauri/tauri.conf.json \
+      --replace-fail '../../target' '../../target/${rust.envVars.rustHostPlatformSpec}'
   '';
 
   # Tries to compile apple specific crates due to workspace dependencies,