feishin: fix darwin builds

Addresses the comment
https://github.com/NixOS/nixpkgs/pull/303638#issuecomment-2052463043
following #303638.
This commit is contained in:
José Ribeiro 2024-04-18 19:13:18 +01:00 committed by Weijia Wang
parent 1e1dc66fe6
commit cb7144e21d

View File

@ -1,8 +1,10 @@
{ {
lib, lib,
stdenv,
buildNpmPackage, buildNpmPackage,
fetchFromGitHub, fetchFromGitHub,
electron_27, electron_27,
darwin,
copyDesktopItems, copyDesktopItems,
makeDesktopItem, makeDesktopItem,
... ...
@ -21,8 +23,7 @@ let
electron = electron_27; electron = electron_27;
in in
buildNpmPackage { buildNpmPackage {
pname = "feishin"; inherit pname version;
inherit version;
inherit src; inherit src;
npmDepsHash = "sha256-+pr9fWg/9kxkYMmthtqhjgF6MOomSQxVCO5V8tHHRdE="; npmDepsHash = "sha256-+pr9fWg/9kxkYMmthtqhjgF6MOomSQxVCO5V8tHHRdE=";
@ -32,17 +33,25 @@ buildNpmPackage {
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
nativeBuildInputs = [ copyDesktopItems ]; nativeBuildInputs =
lib.optionals (stdenv.isLinux) [ copyDesktopItems ]
++ lib.optionals stdenv.isDarwin [ darwin.autoSignDarwinBinariesHook ];
postPatch = '' postPatch =
# release/app dependencies are installed on preConfigure ''
substituteInPlace package.json \ # release/app dependencies are installed on preConfigure
--replace-fail "electron-builder install-app-deps &&" "" substituteInPlace package.json \
--replace-fail "electron-builder install-app-deps &&" ""
# https://github.com/electron/electron/issues/31121 # Don't check for updates.
substituteInPlace src/main/main.ts \ substituteInPlace src/main/main.ts \
--replace-fail "process.resourcesPath" "'$out/share/feishin/resources'" --replace-fail "autoUpdater.checkForUpdatesAndNotify();" ""
''; ''
+ lib.optionalString stdenv.isLinux ''
# https://github.com/electron/electron/issues/31121
substituteInPlace src/main/main.ts \
--replace-fail "process.resourcesPath" "'$out/share/feishin/resources'"
'';
preConfigure = preConfigure =
let let
@ -67,40 +76,59 @@ buildNpmPackage {
done done
''; '';
postBuild = '' postBuild =
npm exec electron-builder -- \ lib.optionalString stdenv.isDarwin ''
--dir \ # electron-builder appears to build directly on top of Electron.app, by overwriting the files in the bundle.
-c.electronDist=${electron}/libexec/electron \ cp -r ${electron}/Applications/Electron.app ./
-c.electronVersion=${electron.version} \ find ./Electron.app -name 'Info.plist' | xargs -d '\n' chmod +rw
-c.npmRebuild=false
'';
installPhase = '' # Disable code signing during build on macOS.
runHook preInstall # https://github.com/electron-userland/electron-builder/blob/fa6fc16/docs/code-signing.md#how-to-disable-code-signing-during-the-build-process-on-macos
export CSC_IDENTITY_AUTO_DISCOVERY=false
sed -i "/afterSign/d" package.json
''
+ ''
npm exec electron-builder -- \
--dir \
-c.electronDist=${if stdenv.isDarwin then "./" else "${electron}/libexec/electron"} \
-c.electronVersion=${electron.version} \
-c.npmRebuild=false
'';
mkdir -p $out/share/feishin installPhase =
pushd release/build/*/ ''
cp -r locales resources{,.pak} $out/share/feishin runHook preInstall
popd ''
+ lib.optionalString stdenv.isDarwin ''
mkdir -p $out/{Applications,bin}
cp -r release/build/**/Feishin.app $out/Applications/
makeWrapper $out/Applications/Feishin.app/Contents/MacOS/Feishin $out/bin/feishin
''
+ lib.optionalString stdenv.isLinux ''
mkdir -p $out/share/feishin
pushd release/build/*/
cp -r locales resources{,.pak} $out/share/feishin
popd
# Code relies on checking app.isPackaged, which returns false if the executable is electron. # Code relies on checking app.isPackaged, which returns false if the executable is electron.
# Set ELECTRON_FORCE_IS_PACKAGED=1. # Set ELECTRON_FORCE_IS_PACKAGED=1.
# https://github.com/electron/electron/issues/35153#issuecomment-1202718531 # https://github.com/electron/electron/issues/35153#issuecomment-1202718531
makeWrapper ${lib.getExe electron} $out/bin/feishin \ makeWrapper ${lib.getExe electron} $out/bin/feishin \
--add-flags $out/share/feishin/resources/app.asar \ --add-flags $out/share/feishin/resources/app.asar \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
--set ELECTRON_FORCE_IS_PACKAGED=1 \ --set ELECTRON_FORCE_IS_PACKAGED=1 \
--inherit-argv0 --inherit-argv0
for size in 32 64 128 256 512 1024; do for size in 32 64 128 256 512 1024; do
mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
ln -s \ ln -s \
$out/share/feishin/resources/assets/icons/"$size"x"$size".png \ $out/share/feishin/resources/assets/icons/"$size"x"$size".png \
$out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png
done done
''
runHook postInstall + ''
''; runHook postInstall
'';
desktopItems = [ desktopItems = [
(makeDesktopItem { (makeDesktopItem {