From d357c1ac4d886e6f24420b8b6204d888b8774066 Mon Sep 17 00:00:00 2001 From: Aiden Schembri Date: Wed, 3 Jun 2026 14:58:00 +0200 Subject: [PATCH] feishin: 1.11.0 -> 1.13.0 (cherry picked from commit 94a206a10f2036c4bacf1258fc54413b1846db3f) --- pkgs/by-name/fe/feishin/package.nix | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix index a43d25c3d323..4f2b94ec6fb8 100644 --- a/pkgs/by-name/fe/feishin/package.nix +++ b/pkgs/by-name/fe/feishin/package.nix @@ -3,29 +3,30 @@ stdenv, buildNpmPackage, fetchFromGitHub, - electron_40, + electron_41, dart-sass, mpv-unwrapped, fetchPnpmDeps, pnpmConfigHook, pnpm_10_29_2, darwin, + actool, copyDesktopItems, makeDesktopItem, nix-update-script, }: let pname = "feishin"; - version = "1.11.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "jeffvli"; repo = "feishin"; tag = "v${version}"; - hash = "sha256-TSjgjNHhPSZ4k7zZTH5e3FCkl6d7B/2w2WCt0S5OW0g="; + hash = "sha256-v6dWzEB1+IK4bHmDo8Rr5e0Xi3OWKcm+UPBmBiSfdZ0="; }; - electron = electron_40; + electron = electron_41; in buildNpmPackage { inherit pname version; @@ -43,7 +44,7 @@ buildNpmPackage { ; pnpm = pnpm_10_29_2; fetcherVersion = 3; - hash = "sha256-2fLqqCbbCIPoW/wGzsZOpZd5tnvyrLYlrVhbFWixlDM="; + hash = "sha256-zNOGJ24G0xcgsGK4DmbBm7d1PHTp7IJS+RTALGRtfDg="; }; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -52,17 +53,15 @@ buildNpmPackage { pnpm_10_29_2 ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ copyDesktopItems ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.autoSignDarwinBinariesHook ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.autoSignDarwinBinariesHook + actool + ]; postPatch = '' # release/app dependencies are installed on preConfigure substituteInPlace package.json \ --replace-fail '"postinstall": "electron-builder install-app-deps",' "" - '' - + lib.optionalString stdenv.hostPlatform.isLinux '' - # https://github.com/electron/electron/issues/31121 - substituteInPlace src/main/index.ts \ - --replace-fail "process.resourcesPath" "'$out/share/feishin/resources'" ''; preBuild = ''