Bump electron-builder to 26.15.0, improve Nix flake (#1876)

This commit is contained in:
Sapphire authored and GitHub committed 2026-06-21 05:26:09 +02:00
1 parent a45925bc36
commit 8df1e3dc4c
5 files changed
+398 -552

No files matched your search

+4 -4
View File
@@ -1,9 +1,9 @@
if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.1/direnvrc" "sha256-zelF0vLbEl5uaqrfIzbgNzJWGmLzCmYAkInj/LNxvKs="
if ! has nix_direnv_version || ! nix_direnv_version 3.1.1; then
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.1.1/direnvrc" "sha256-p+fzQdrms/hDa7g+soShAybJNo4bN4SIAeSfqNKgD5I="
fi
nix_direnv_watch_file package.json
if ! use flake . --impure
watch_file package.json
if ! use flake .
then
echo "devenv could not be built. The devenv environment was not loaded. Make the necessary changes to devenv.nix and hit enter to try again." >&2
fi
Generated
+6 -6
View File
@@ -5,11 +5,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1777988971,
"narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
"lastModified": 1778716662,
"narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
"rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
"type": "github"
},
"original": {
@@ -20,11 +20,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1777954456,
"narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
"lastModified": 1781577229,
"narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
"rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
"type": "github"
},
"original": {
+134 -69
View File
@@ -14,86 +14,151 @@
...
}:
flake-parts.lib.mkFlake { inherit inputs; } {
systems = [ "x86_64-linux" ];
systems = [
"aarch64-linux"
"x86_64-linux"
];
perSystem =
{ pkgs, ... }:
{ lib, pkgs, ... }:
let
runtimeLibs =
pkgs:
(with pkgs; [
jdk17
runtimeLibs = [
pkgs.alsa-lib
pkgs.libpulseaudio
pkgs.at-spi2-atk
pkgs.at-spi2-core
pkgs.cairo
pkgs.cups
pkgs.dbus
pkgs.expat
pkgs.gdk-pixbuf
pkgs.glib
pkgs.gtk3
pkgs.libdrm
pkgs.libgbm
pkgs.libglvnd
pkgs.libnotify
pkgs.libxkbcommon
pkgs.mesa
pkgs.nspr
pkgs.nss
pkgs.pango
pkgs.systemd
pkgs.vulkan-loader
pkgs.wayland
pkgs.libX11
pkgs.libXcomposite
pkgs.libXdamage
pkgs.libXext
pkgs.libXfixes
pkgs.libXrandr
pkgs.libxcb
pkgs.libxshmfence
pkgs.libusb1
pkgs.udev
pkgs.libxcrypt-legacy
];
alsa-lib
libpulseaudio
at-spi2-atk
at-spi2-core
cairo
cups
dbus
expat
gdk-pixbuf
glib
gtk3
libdrm
libgbm
libglvnd
libnotify
libxkbcommon
mesa
nspr
nss
pango
systemd
vulkan-loader
wayland
libX11
libXcomposite
libXdamage
libXext
libXfixes
libXrandr
libxcb
libxshmfence
libusb1
udev
libxcrypt-legacy
rpm
fpm
toolDirectoryName =
if pkgs.stdenv.hostPlatform.isDarwin then
"darwin"
else if pkgs.stdenv.hostPlatform.isLinux then
{
"armv7l-linux" = "linux-arm32";
"aarch64-linux" = "linux-arm64";
"i686-linux" = "linux-ia32";
"x86_64-linux" = "linux-x64";
}
."${pkgs.stdenv.hostPlatform.system}"
else
throw "Unsupported platform";
wineWow64Packages.stable
zlib
squashfsTools
fakeroot
libarchive
icu
nodejs_22
pnpm
pkg-config
python3
gcc
gnumake
binutils
git
node-gyp-build
]);
# we use fuse2
# https://github.com/electron-userland/electron-builder/blob/a6117b3011a105204af8cc2eca02a56976d1ef29/packages/app-builder-lib/src/toolsets/linux.ts#L122
runtime = pkgs.stdenvNoCC.mkDerivation {
name = "electron-builder-appimage-runtime";
src = pkgs.fetchurl {
url = "https://github.com/electron-userland/electron-builder-binaries/releases/download/appimage-12.0.1/appimage-12.0.1.7z";
hash = "sha256-0S/3648dHsRlLKUjen+9yjOswMdYBFY2/spi3G7LjsQ=";
};
# https://github.com/NixOS/nixpkgs/blob/7890ba0a99c064446fe2178ef2f8e3abdf6ec42a/pkgs/by-name/lo/losslesscut-bin/build-from-windows.nix#L20
nativeBuildInputs = [ pkgs.p7zip ];
unpackPhase = ''
runHook preUnpack
7z x "$src"
runHook postUnpack
'';
installPhase = ''
mkdir $out
cp -r -t $out/ \
lib/ \
runtime-*
'';
};
slimeShell = pkgs.buildFHSEnv {
name = "slimevr-env";
targetPkgs = runtimeLibs;
profile = ''
export JAVA_HOME=${pkgs.jdk17}
export PATH="${pkgs.jdk17}/bin:$PATH"
appImageTools = pkgs.stdenvNoCC.mkDerivation {
name = "electron-builder-appimage-tools";
dontUnpack = true;
# Tell electron-builder to use system tools instead of downloading them
export USE_SYSTEM_FPM=true
export USE_SYSTEM_MKSQUASHFS=true
installPhase = ''
mkdir -p "$out/${toolDirectoryName}"
ln -s -t $out/${toolDirectoryName} \
"${pkgs.desktop-file-utils}/bin/desktop-file-validate" \
"${pkgs.squashfsTools}/bin/mksquashfs"
ln -s ${runtime}/runtime-* $out/
ln -s ${runtime}/lib $out/lib
'';
runScript = "bash";
};
in
{
devShells.default = slimeShell.env;
devShells.default = pkgs.mkShell {
packages = [
# for running the jar
pkgs.jdk17
# for build
pkgs.electron
pkgs.rpm
pkgs.fpm
pkgs.p7zip
pkgs.wineWow64Packages.stable
pkgs.zlib
pkgs.squashfsTools
pkgs.desktop-file-utils
pkgs.fakeroot
pkgs.libarchive
pkgs.icu
pkgs.nodejs_22
pkgs.pnpm
pkgs.pkg-config
pkgs.python3
pkgs.gcc
pkgs.gnumake
pkgs.binutils
pkgs.git
pkgs.node-gyp-build
];
buildInputs = runtimeLibs;
JAVA_HOME = "${pkgs.jdk17}/lib/openjdk";
USE_SYSTEM_FPM = "true";
ELECTRON_BUILDER_7ZIP_PATH = "${pkgs.p7zip}/bin/7za";
APPIMAGE_TOOLS_PATH = "${appImageTools}";
#ELECTRON_SKIP_BINARY_DOWNLOAD = true;
#ELECTRON_DIST = "${pkgs.electron.dist}";
#ELECTRON_VERSION = "${pkgs.electron.version}";
# for electron-vite, so `pnpm gui` works
ELECTRON_EXEC_PATH = "${pkgs.electron}/bin/electron";
shellHook = ''
export LD_LIBRARY_PATH="${
lib.makeLibraryPath [
pkgs.systemd
pkgs.hidapi
]
}:$LD_LIBRARY_PATH"
'';
};
};
};
}
+1 -1
View File
@@ -68,7 +68,7 @@
"dmg-license": "^1.0.11",
"dotenv": "^16.4.5",
"electron": "^40.3.0",
"electron-builder": "^26.9.0",
"electron-builder": "^26.15.0",
"electron-vite": "^5.0.0",
"@eslint/eslintrc": "^3.3.5",
"@eslint/js": "^9.39.4",
+253 -472
View File
File diff suppressed because it is too large. Load diff