From 0dc6e3caaa371aaaa266174411864ffc92bdefbf Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Tue, 22 Apr 2025 21:48:57 +1200 Subject: [PATCH 1/2] heroic: bump electron version Pinned Electron version is EOL soon. --- pkgs/by-name/he/heroic-unwrapped/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/he/heroic-unwrapped/package.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix index f6ac7868637f..c92d68d57353 100644 --- a/pkgs/by-name/he/heroic-unwrapped/package.nix +++ b/pkgs/by-name/he/heroic-unwrapped/package.nix @@ -8,7 +8,7 @@ python3, makeWrapper, # Upstream uses EOL Electron 31. Use next oldest version. - electron_33, + electron_34, vulkan-helper, gogdl, legendary-heroic, @@ -17,7 +17,7 @@ }: let - electron = electron_33; + electron = electron_34; in stdenv.mkDerivation (finalAttrs: { pname = "heroic-unwrapped"; From 4f25858e08f79cb9563bd91cc8355a87bf321c6a Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Fri, 25 Apr 2025 09:22:44 +1200 Subject: [PATCH 2/2] heroic: simplify code to make node-gyp run offline Co-authored-by: TomaSajt <62384384+TomaSajt@users.noreply.github.com> --- pkgs/by-name/he/heroic-unwrapped/package.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/by-name/he/heroic-unwrapped/package.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix index c92d68d57353..f51612b4fbcc 100644 --- a/pkgs/by-name/he/heroic-unwrapped/package.nix +++ b/pkgs/by-name/he/heroic-unwrapped/package.nix @@ -53,11 +53,7 @@ stdenv.mkDerivation (finalAttrs: { runHook preBuild # set nodedir to prevent node-gyp from downloading headers - # taken from https://nixos.org/manual/nixpkgs/stable/#javascript-tool-specific - mkdir -p $HOME/.node-gyp/${nodejs.version} - echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion - ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version} - export npm_config_nodedir=${nodejs} + export npm_config_nodedir=${electron.headers} pnpm --offline electron-vite build pnpm --offline electron-builder \