fix(nix): missing runtime libs & small changes (#1956)

Add the missing runtime libs to LD_LIBRARY_PATH. Also pin pnpm and electron versions, use getExe and update flake lock.

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1777268161,
+        "lastModified": 1780243769,
-        "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
+        "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
+        "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
         "type": "github"
       },
       "original": {

nix/common.nix

@@ -3,14 +3,17 @@
   stdenvNoCC,
   fetchPnpmDeps,
 
-  pnpm_10,
-  pnpmConfigHook,
-
   cacert,
   gitMinimal,
   nodejs,
+  pnpm_10,
+  pnpmConfigHook,
 }:
 
+let
+  pnpm = pnpm_10;
+in
+
 stdenvNoCC.mkDerivation (final: {
   pname = "airi";
   version = (builtins.fromJSON (builtins.readFile ../package.json)).version;
@@ -41,7 +44,7 @@ stdenvNoCC.mkDerivation (final: {
       cacert # For network request
       gitMinimal # For unplugin-info
       nodejs
-      pnpm_10
+      pnpm
       pnpmConfigHook
     ];
 

nix/package.nix

@@ -1,19 +1,31 @@
 {
   stdenvNoCC,
+  lib,
   callPackage,
-
-  copyDesktopItems,
   makeDesktopItem,
+
+  asar,
+  copyDesktopItems,
   makeWrapper,
   gitMinimal,
+  nodejs,
   pnpm_10,
   pnpmConfigHook,
 
-  asar,
+  electron_41,
-  electron,
+  libxt,
-  nodejs,
+  libxtst,
 }:
 
+let
+  pnpm = pnpm_10;
+  electron = electron_41;
+  libraryPath = lib.makeLibraryPath [
+    libxt
+    libxtst
+  ];
+in
+
 (callPackage ./common.nix { }).overrideAttrs (final: {
   nativeBuildInputs = [
     asar
@@ -21,7 +33,7 @@
     makeWrapper
     gitMinimal
     nodejs
-    pnpm_10
+    pnpm
     pnpmConfigHook
   ];
 
@@ -81,9 +93,10 @@
     cp -r "$assets"/{vrm,live2d} app/out/renderer/assets
     asar pack app app.asar
 
-    makeWrapper "${electron}/bin/electron" "$out/bin/airi" \
+    makeWrapper "${lib.getExe electron}" "$out/bin/airi" \
       --add-flags "$out/opt/AIRI/resources/app.asar" \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-wayland-ime=true --wayland-text-input-version=3}}"
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-wayland-ime=true --wayland-text-input-version=3}}" \
+      --prefix LD_LIBRARY_PATH : "${libraryPath}"
 
     runHook postInstall
   '';