mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-27 08:04:14 +00:00
152c4696ee
Diff: https://github.com/bitwarden/clients/compare/desktop-v2024.9.0...desktop-v2024.11.1 Changelog: https://github.com/bitwarden/clients/releases/tag/desktop-v2024.11.1 - This includes update to node-argon2 that removes the need for our fix. - Upstream now also attempts to modify the "fuses" of bin/electron, but that fails for us as we are wrapping the read-only electron. So simply skip that in the afterpack. Also, in afterpack, skip creating the wrapper script since we don't use it anyway (again, we wrap electron directly passing the asar). - Update biometric patch as file was moved upstream. - Beware that Bitwarden 2024.10.x was unfree, hence having skipped a few versions, see https://github.com/bitwarden/clients/issues/11611
40 lines
1.6 KiB
Diff
40 lines
1.6 KiB
Diff
diff --git a/apps/desktop/scripts/after-pack.js b/apps/desktop/scripts/after-pack.js
|
|
index fd16cd5ffb..05a2325ee1 100644
|
|
--- a/apps/desktop/scripts/after-pack.js
|
|
+++ b/apps/desktop/scripts/after-pack.js
|
|
@@ -13,25 +13,6 @@ async function run(context) {
|
|
console.log("## After pack");
|
|
// console.log(context);
|
|
|
|
- if (context.packager.platform.nodeName !== "darwin" || context.arch === builder.Arch.universal) {
|
|
- await addElectronFuses(context);
|
|
- }
|
|
-
|
|
- if (context.electronPlatformName === "linux") {
|
|
- console.log("Creating memory-protection wrapper script");
|
|
- const appOutDir = context.appOutDir;
|
|
- const oldBin = path.join(appOutDir, context.packager.executableName);
|
|
- const newBin = path.join(appOutDir, "bitwarden-app");
|
|
- fse.moveSync(oldBin, newBin);
|
|
- console.log("Moved binary to bitwarden-app");
|
|
-
|
|
- const wrapperScript = path.join(__dirname, "../resources/memory-dump-wrapper.sh");
|
|
- const wrapperBin = path.join(appOutDir, context.packager.executableName);
|
|
- fse.copyFileSync(wrapperScript, wrapperBin);
|
|
- fse.chmodSync(wrapperBin, "755");
|
|
- console.log("Copied memory-protection wrapper script");
|
|
- }
|
|
-
|
|
if (["darwin", "mas"].includes(context.electronPlatformName)) {
|
|
const is_mas = context.electronPlatformName === "mas";
|
|
const is_mas_dev = context.targets.some((e) => e.name === "mas-dev");
|
|
@@ -140,6 +121,8 @@ function getIdentities() {
|
|
* @param {import("electron-builder").AfterPackContext} context
|
|
*/
|
|
async function addElectronFuses(context) {
|
|
+ return;
|
|
+
|
|
const platform = context.packager.platform.nodeName;
|
|
|
|
const ext = {
|