mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
electron-fiddle: fix build with newer nodejs versions by bumping yauzl
(cherry picked from commit 6308382b89)
This commit is contained in:
parent
248458fa24
commit
0d8e5d0b58
2 changed files with 71 additions and 5 deletions
61
pkgs/by-name/el/electron-fiddle/bump-yauzl.patch
Normal file
61
pkgs/by-name/el/electron-fiddle/bump-yauzl.patch
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
diff --git a/package.json b/package.json
|
||||
index 7e49e7a..ab5c306 100644
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -166,6 +166,7 @@
|
||||
]
|
||||
},
|
||||
"resolutions": {
|
||||
+ "yauzl": "^3.3.1",
|
||||
"@electron-forge/maker-base": "7.8.1",
|
||||
"@electron-forge/shared-types": "7.8.1"
|
||||
}
|
||||
diff --git a/yarn.lock b/yarn.lock
|
||||
index a4d91bb..8ae6ff9 100644
|
||||
--- a/yarn.lock
|
||||
+++ b/yarn.lock
|
||||
@@ -3653,11 +3653,6 @@ browserslist@^4.21.10:
|
||||
node-releases "^2.0.18"
|
||||
update-browserslist-db "^1.1.0"
|
||||
|
||||
-buffer-crc32@~0.2.3:
|
||||
- version "0.2.13"
|
||||
- resolved "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"
|
||||
- integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
|
||||
-
|
||||
buffer-from@^1.0.0:
|
||||
version "1.1.2"
|
||||
resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"
|
||||
@@ -5746,13 +5741,6 @@ faye-websocket@^0.11.3:
|
||||
dependencies:
|
||||
websocket-driver ">=0.5.1"
|
||||
|
||||
-fd-slicer@~1.1.0:
|
||||
- version "1.1.0"
|
||||
- resolved "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz"
|
||||
- integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==
|
||||
- dependencies:
|
||||
- pend "~1.2.0"
|
||||
-
|
||||
fdir@^6.4.4, fdir@^6.4.6:
|
||||
version "6.4.6"
|
||||
resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.6.tgz#2b268c0232697063111bbf3f64810a2a741ba281"
|
||||
@@ -12352,13 +12340,12 @@ yargs@^17.0.1:
|
||||
y18n "^5.0.5"
|
||||
yargs-parser "^21.1.1"
|
||||
|
||||
-yauzl@^2.10.0:
|
||||
- version "2.10.0"
|
||||
- resolved "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz"
|
||||
- integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==
|
||||
+yauzl@^2.10.0, yauzl@^3.3.1:
|
||||
+ version "3.4.0"
|
||||
+ resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-3.4.0.tgz#88b2a21455f37ca7dccf2eeb33bacb4392322719"
|
||||
+ integrity sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==
|
||||
dependencies:
|
||||
- buffer-crc32 "~0.2.3"
|
||||
- fd-slicer "~1.1.0"
|
||||
+ pend "~1.2.0"
|
||||
|
||||
yocto-queue@^0.1.0:
|
||||
version "0.1.0"
|
||||
|
|
@ -25,15 +25,20 @@ let
|
|||
hash = "sha256-e9PLgkqWBNLBw7uuNpPluOQ6+aGLYQLyTzcLa+LMOzs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./dont-use-initial-releases-json.patch
|
||||
|
||||
# zip extraction fails on newer nodejs versions without this fix
|
||||
./bump-yauzl.patch
|
||||
];
|
||||
|
||||
unwrapped = stdenvNoCC.mkDerivation {
|
||||
pname = "${pname}-unwrapped";
|
||||
inherit version src;
|
||||
|
||||
patches = [ ./dont-use-initial-releases-json.patch ];
|
||||
inherit version src patches;
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
inherit src;
|
||||
hash = "sha256-mB8WG6tX204u6AJ8qLbWrA+pSN3oDihHqj0t3bWcuAI=";
|
||||
inherit src patches;
|
||||
hash = "sha256-5yUsjXQ3OHwEGFgMTUJAXAuTdAl4zkb8zxTs5OT6sw4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue