Skip to content

Commit aa2260c

Browse files
authored
fx-cast-bridge: bump nan version to support newer nodejs versions (#400932)
2 parents b94c825 + b139879 commit aa2260c

File tree

2 files changed

+44
-5
lines changed

2 files changed

+44
-5
lines changed
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
diff --git a/package-lock.json b/package-lock.json
2+
index c856a73..59d3cc5 100644
3+
--- a/package-lock.json
4+
+++ b/package-lock.json
5+
@@ -1240,9 +1240,10 @@
6+
}
7+
},
8+
"node_modules/nan": {
9+
- "version": "2.15.0",
10+
- "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz",
11+
- "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="
12+
+ "version": "2.22.2",
13+
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz",
14+
+ "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==",
15+
+ "license": "MIT"
16+
},
17+
"node_modules/napi-build-utils": {
18+
"version": "1.0.2",
19+
@@ -3189,9 +3190,9 @@
20+
"dev": true
21+
},
22+
"nan": {
23+
- "version": "2.15.0",
24+
- "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz",
25+
- "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="
26+
+ "version": "2.22.2",
27+
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz",
28+
+ "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ=="
29+
},
30+
"napi-build-utils": {
31+
"version": "1.0.2",

pkgs/by-name/fx/fx-cast-bridge/package.nix

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
buildNpmPackage,
44
fetchFromGitHub,
55
avahi-compat,
6-
nodejs_18,
6+
nodejs_22,
77
python3,
88
stdenv,
99
}:
@@ -12,23 +12,31 @@ buildNpmPackage rec {
1212
pname = "fx-cast-bridge";
1313
version = "0.3.1";
1414

15-
nodejs = nodejs_18;
15+
nodejs = nodejs_22;
1616

1717
src = fetchFromGitHub {
1818
owner = "hensm";
1919
repo = "fx_cast";
2020
rev = "v${version}";
2121
hash = "sha256-hB4NVJW2exHoKsMp0CKzHerYgj8aR77rV+ZsCoWA1Dg=";
2222
};
23+
2324
sourceRoot = "${src.name}/app";
24-
npmDepsHash = "sha256-GLrDRZqKcX1PDGREx+MLZ1TEjr88r9nz4TvZ9nvo40g=";
25+
26+
patches = [
27+
# to support later versions of nodejs
28+
# generated by running `npm update nan --ignore-scripts` in the ./app dir
29+
./bump-nan.patch
30+
];
31+
32+
npmDepsHash = "sha256-23EZC9v4ODu3k+O9NDVhOdGJ/FfaiTVWtTrK8liAevk=";
2533

2634
nativeBuildInputs = [ python3 ];
2735
buildInputs = [ avahi-compat ];
2836

2937
postPatch = ''
3038
substituteInPlace bin/lib/paths.js \
31-
--replace "../../../" "../../"
39+
--replace-fail "../../../" "../../"
3240
'';
3341

3442
dontNpmInstall = true;
@@ -38,7 +46,7 @@ buildNpmPackage rec {
3846
mkdir -p $out/{bin,lib/mozilla/native-messaging-hosts}
3947
4048
substituteInPlace dist/app/fx_cast_bridge.json \
41-
--replace "$(realpath dist/app/fx_cast_bridge.sh)" "$out/bin/fx_cast_bridge"
49+
--replace-fail "$(realpath dist/app/fx_cast_bridge.sh)" "$out/bin/fx_cast_bridge"
4250
mv dist/app/fx_cast_bridge.json $out/lib/mozilla/native-messaging-hosts
4351
4452
rm dist/app/fx_cast_bridge.sh

0 commit comments

Comments
 (0)