From f302f038e18197322dd02877e1d02d36f3d1cd20 Mon Sep 17 00:00:00 2001 From: BatteredBunny Date: Mon, 14 Sep 2026 20:50:08 +0300 Subject: [PATCH] feishin: 1.15.1 -> 1.17.0 --- pkgs/by-name/fe/feishin/package.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix index 094111c60555..07763edfe439 100644 --- a/pkgs/by-name/fe/feishin/package.nix +++ b/pkgs/by-name/fe/feishin/package.nix @@ -8,7 +8,6 @@ fetchPnpmDeps, pnpmConfigHook, pnpm_11, - nodejs-slim_latest, darwin, actool, copyDesktopItems, @@ -20,18 +19,17 @@ let electron = electron_43; - # Fix pnpm issue on darwin https://github.com/NixOS/nixpkgs/issues/525627 - pnpm = pnpm_11.override { nodejs-slim = nodejs-slim_latest; }; + pnpm = pnpm_11; in buildNpmPackage (finalAttrs: { pname = "feishin"; - version = "1.15.1"; + version = "1.17.0"; src = fetchFromGitHub { owner = "jeffvli"; repo = "feishin"; tag = "v${finalAttrs.version}"; - hash = "sha256-2UKJBUZNUpUUZIG1JFXok7YJdzqt+Ge0ykHUm8BeNcw="; + hash = "sha256-1ZIw5XiN+2EhpHmdvN0HxgMSvn4QvN9B+ZJ3RlPXhLw="; }; __structuredAttrs = true; @@ -48,7 +46,7 @@ buildNpmPackage (finalAttrs: { src ; fetcherVersion = 4; - hash = "sha256-9uG0AxIBAmuIPywg3p9fFCXmRvM9zDLhWfluSLRnUXY="; + hash = "sha256-ltpz4e5Vv2vxt/93M4+vHUFJZjwTRwb2zrwvl1Lqjo8="; }; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -65,7 +63,7 @@ buildNpmPackage (finalAttrs: { postPatch = '' # release/app dependencies are installed on preConfigure substituteInPlace package.json \ - --replace-fail '"postinstall": "electron-builder install-app-deps",' "" + --replace-fail '"postinstall": "install-electron && electron-builder install-app-deps",' "" ''; postBuild = lib.optionalString (!webVersion) ''