mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
unofficial-homestuck-collection: upgrade Electron requirement to 14
Signed-off-by: tsrk. <tsrk@tsrk.me>
This commit is contained in:
parent
dd29250a8a
commit
7b38b2c0de
3 changed files with 15372 additions and 2 deletions
|
|
@ -0,0 +1,40 @@
|
|||
From 95734ddc06af1e98a0a6165d382c353c423c6e63 Mon Sep 17 00:00:00 2001
|
||||
From: "tsrk." <tsrk@tsrk.me>
|
||||
Date: Sun, 24 May 2026 05:14:44 +0200
|
||||
Subject: [PATCH 4/4] Upgrade Electron 14 to force removal of remote module
|
||||
Cc: Freya Murphy <freya@freyacat.org>
|
||||
|
||||
Signed-off-by: tsrk. <tsrk@tsrk.me>
|
||||
---
|
||||
package.json | 2 +-
|
||||
src/background.js | 1 -
|
||||
2 files changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/package.json b/package.json
|
||||
index 54a0ec9..9404be1 100644
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -80,7 +80,7 @@
|
||||
"acorn": "^8",
|
||||
"babel-loader": "^8.1.2",
|
||||
"css-loader": "^3.5",
|
||||
- "electron": "^9.0.0",
|
||||
+ "electron": "^14.2.9",
|
||||
"electron-builder-squirrel-windows": "24.13.3",
|
||||
"electron-devtools-assembler": "^1.2.0",
|
||||
"electron-icon-builder": "^1.0.2",
|
||||
diff --git a/src/background.js b/src/background.js
|
||||
index 6fa2256..3a4b6d7 100644
|
||||
--- a/src/background.js
|
||||
+++ b/src/background.js
|
||||
@@ -750,7 +750,6 @@ async function createWindow () {
|
||||
// MOD: disable isolation to get
|
||||
// collection to work with electron 35
|
||||
contextIsolation: false,
|
||||
- enableRemoteModule: true,
|
||||
plugins: true,
|
||||
webviewTag: true
|
||||
}
|
||||
--
|
||||
2.51.2
|
||||
|
||||
|
|
@ -31,11 +31,12 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
})
|
||||
./0002-disable-update-check.patch
|
||||
./0003-make-compatible-with-native-electron.patch
|
||||
./0004-Upgrade-Electron-14-to-force-removal-of-remote-module.patch
|
||||
];
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/yarn.lock";
|
||||
hash = "sha256-mo5Ir/pLoqc6K/0AOJqKC0yup7vx9UrNfQ+casIgBCo=";
|
||||
yarnLock = ./yarn.lock;
|
||||
hash = "sha256-CKWFtIZBASGx/1tBR8n7aKPqfj4P9dCAPIzee/DIOP8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -49,6 +50,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
# Replace lockfile with our own (sync offline cache)
|
||||
cp -f ${./yarn.lock} yarn.lock
|
||||
|
||||
# setup yarn
|
||||
fixup-yarn-lock yarn.lock
|
||||
yarn config --offline set ignore-engines true
|
||||
|
|
|
|||
15326
pkgs/by-name/un/unofficial-homestuck-collection/yarn.lock
generated
Normal file
15326
pkgs/by-name/un/unofficial-homestuck-collection/yarn.lock
generated
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue