From b038c3cd5bac8c5ae70219ae9c2f0c51891d6030 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 25 May 2026 02:23:23 +0200 Subject: [PATCH 1/6] shogihome: remove workaround --- pkgs/by-name/sh/shogihome/package.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/sh/shogihome/package.nix b/pkgs/by-name/sh/shogihome/package.nix index e7db98e5c729..e47e4cc0c3df 100644 --- a/pkgs/by-name/sh/shogihome/package.nix +++ b/pkgs/by-name/sh/shogihome/package.nix @@ -5,7 +5,6 @@ fetchFromGitHub, makeWrapper, electron_40, - vulkan-loader, makeDesktopItem, copyDesktopItems, commandLineArgs ? [ ], @@ -67,17 +66,12 @@ buildNpmPackage (finalAttrs: { cp -r ${electron.dist} electron-dist chmod -R u+w electron-dist - '' - # Electron builder complains about symlink in electron-dist - + lib.optionalString stdenv.hostPlatform.isLinux '' - rm electron-dist/libvulkan.so.1 - cp '${lib.getLib vulkan-loader}/lib/libvulkan.so.1' electron-dist - '' - # Explicitly set identity to null to avoid signing on arm64 macs with newer electron-builder. - # See: https://github.com/electron-userland/electron-builder/pull/9007 - + '' + npm run electron:pack + # Explicitly set identity to null to avoid signing on arm64 macs with newer electron-builder. + # See: https://github.com/electron-userland/electron-builder/pull/9007 + ./node_modules/.bin/electron-builder \ --dir \ --config .electron-builder.config.mjs \ From 6aee68d36492713cc56399a0a597e115ef606269 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 25 May 2026 02:23:13 +0200 Subject: [PATCH 2/6] teams-for-linux: don't place electronDist in cwd --- pkgs/by-name/te/teams-for-linux/package.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index 5476e70d977e..d412e0435433 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -10,7 +10,6 @@ makeWrapper, nix-update-script, versionCheckHook, - vulkan-loader, which, }: @@ -46,21 +45,15 @@ buildNpmPackage rec { buildPhase = '' runHook preBuild - cp -r ${electron_41.dist} electron-dist - chmod -R u+w electron-dist - '' - # Electron builder complains about symlink in electron-dist - + lib.optionalString stdenv.hostPlatform.isLinux '' - rm electron-dist/libvulkan.so.1 - cp ${lib.getLib vulkan-loader}/lib/libvulkan.so.1 electron-dist - '' - + '' + electron_dist="$(mktemp -d)" + cp -r ${electron_41.dist}/. "$electron_dist" + chmod -R u+w "$electron_dist" npm exec electron-builder -- \ --dir \ -c.npmRebuild=true \ -c.asarUnpack="**/*.node" \ - -c.electronDist=electron-dist \ + -c.electronDist="$electron_dist" \ -c.electronVersion=${electron_41.version} \ -c.mac.identity=null From c4f908d08e8844d1318d47fc1ba157ea00487d82 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 25 May 2026 03:27:57 +0200 Subject: [PATCH 3/6] caprine: don't place electronDist in cwd --- pkgs/by-name/ca/caprine/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/caprine/package.nix b/pkgs/by-name/ca/caprine/package.nix index 18161241ebc4..cd32fdc09816 100644 --- a/pkgs/by-name/ca/caprine/package.nix +++ b/pkgs/by-name/ca/caprine/package.nix @@ -27,14 +27,15 @@ buildNpmPackage rec { nativeBuildInputs = [ copyDesktopItems ]; postBuild = '' - cp -r ${electron.dist} electron-dist - chmod -R u+w electron-dist + electron_dist="$(mktemp -d)" + cp -r ${electron.dist}/. "$electron_dist" + chmod -R u+w "$electron_dist" npm exec electron-builder -- \ --dir \ -c.npmRebuild=true \ -c.asarUnpack="**/*.node" \ - -c.electronDist=electron-dist \ + -c.electronDist="$electron_dist" \ -c.electronVersion=${electron.version} ''; From d9dc678568082d1fb1683d34d1b65ee71a347320 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 25 May 2026 02:48:10 +0200 Subject: [PATCH 4/6] mqtt-explorer: don't place electronDist in cwd --- pkgs/by-name/mq/mqtt-explorer/package.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mq/mqtt-explorer/package.nix b/pkgs/by-name/mq/mqtt-explorer/package.nix index e5a0d9c9dbfa..1f09774684f6 100644 --- a/pkgs/by-name/mq/mqtt-explorer/package.nix +++ b/pkgs/by-name/mq/mqtt-explorer/package.nix @@ -86,8 +86,9 @@ stdenv.mkDerivation rec { patchShebangs {node_modules,app/node_modules,backend/node_modules} - cp -r ${electron.dist} electron-dist - chmod -R u+w electron-dist + electron_dist="$(mktemp -d)" + cp -r ${electron.dist}/. "$electron_dist" + chmod -R u+w "$electron_dist" runHook postConfigure ''; @@ -98,7 +99,7 @@ stdenv.mkDerivation rec { tsc && cd app && yarn --offline run build && cd .. yarn --offline run electron-builder --dir \ - -c.electronDist=electron-dist \ + -c.electronDist="$electron_dist" \ -c.electronVersion=${electron.version} runHook postBuild @@ -143,7 +144,7 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = '' - export ELECTRON_OVERRIDE_DIST_PATH=electron-dist/ + export ELECTRON_OVERRIDE_DIST_PATH="$electron_dist" yarn test:app --offline yarn test:backend --offline From ceba9e30446806827483c67e3b94cf434d55bd46 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 25 May 2026 02:22:47 +0200 Subject: [PATCH 5/6] repath-studio: don't place electronDist in cwd --- pkgs/by-name/re/repath-studio/package.nix | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/re/repath-studio/package.nix b/pkgs/by-name/re/repath-studio/package.nix index f4560fed21e6..4502ba2dc6c9 100644 --- a/pkgs/by-name/re/repath-studio/package.nix +++ b/pkgs/by-name/re/repath-studio/package.nix @@ -16,8 +16,6 @@ makeWrapper, replaceVars, - vulkan-loader, - nixosTests, }: buildNpmPackage (finalAttrs: { @@ -72,19 +70,13 @@ buildNpmPackage (finalAttrs: { buildPhase = '' runHook preBuild - # electronDist needs to be modifiable - cp -r ${electron.dist} electron-dist - chmod -R u+w electron-dist - '' - # Electron builder complains about symlink in electron-dist - + lib.optionalString stdenv.hostPlatform.isLinux '' - rm electron-dist/libvulkan.so.1 - cp ${lib.getLib vulkan-loader}/lib/libvulkan.so.1 electron-dist - '' - + '' + electron_dist="$(mktemp -d)" + cp -r ${electron.dist}/. "$electron_dist" + chmod -R u+w "$electron_dist" + npm run build npm exec electron-builder -- --dir \ - -c.electronDist=electron-dist \ + -c.electronDist="$electron_dist" \ -c.electronVersion=${electron.version} runHook postBuild @@ -123,7 +115,7 @@ buildNpmPackage (finalAttrs: { doCheck = stdenv.hostPlatform.isLinux; checkPhase = '' runHook preCheck - export ELECTRON_OVERRIDE_DIST_PATH=electron-dist/ + export ELECTRON_OVERRIDE_DIST_PATH="$electron_dist" export PUPPETEER_EXECUTABLE_PATH=${chromium}/bin/chromium export CHROME_BIN=${chromium}/bin/chromium npm run test From 50d308b4a3e3901dd9fc091bffa2af6475d7381b Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 25 May 2026 03:45:45 +0200 Subject: [PATCH 6/6] ivpn-ui: don't place electronDist in cwd --- pkgs/by-name/iv/ivpn-ui/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/iv/ivpn-ui/package.nix b/pkgs/by-name/iv/ivpn-ui/package.nix index cc069c4a06ac..959f5b10666c 100644 --- a/pkgs/by-name/iv/ivpn-ui/package.nix +++ b/pkgs/by-name/iv/ivpn-ui/package.nix @@ -34,12 +34,13 @@ buildNpmPackage (finalAttrs: { }; postBuild = '' - cp -r ${electron.dist} electron-dist - chmod -R u+w electron-dist + electron_dist="$(mktemp -d)" + cp -r ${electron.dist}/. "$electron_dist" + chmod -R u+w "$electron_dist" npm exec electron-builder -- \ --dir \ - -c.electronDist=electron-dist \ + -c.electronDist="$electron_dist" \ -c.electronVersion=${electron.version} \ --config electron-builder.config.js '';