diff options
9 files changed, 16 insertions, 17 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 921fe3c5cb795..b7cbe4b13232c 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -290,3 +290,5 @@ The module update takes care of the new config syntax and the data itself (user ./common/auto-format-root-device.nix ];` When you use the systemd initrd, you can automatically format the root device by setting `virtualisation.fileSystems."/".autoFormat = true;`. + +- The `electron` packages now places its application files in `$out/libexec/electron` instead of `$out/lib/electron`. Packages using electron-builder will fail to build and need to be adjusted by changing `lib` to `libexec`. diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 94ed3d87ba8e2..9c69a4bebff0d 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { yarn --offline run electron-builder --dir \ --config electron-builder-linux-mac.json \ - -c.electronDist=${electron}/lib/electron \ + -c.electronDist=${electron}/libexec/electron \ -c.electronVersion=${electron.version} runHook postBuild diff --git a/pkgs/applications/misc/kuro/default.nix b/pkgs/applications/misc/kuro/default.nix index 26c8d6bbf11b5..50a773b5c5182 100644 --- a/pkgs/applications/misc/kuro/default.nix +++ b/pkgs/applications/misc/kuro/default.nix @@ -38,7 +38,7 @@ mkYarnPackage rec { yarn --offline run electron-builder \ --dir \ - -c.electronDist=${electron}/lib/electron \ + -c.electronDist=${electron}/libexec/electron \ -c.electronVersion=${electron.version} popd diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix index ec318aa3e18e4..c069761238165 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { yarn --offline electron-builder \ --dir ${if stdenv.isDarwin then "--macos" else "--linux"} ${if stdenv.hostPlatform.isAarch64 then "--arm64" else "--x64"} \ - -c.electronDist=${electron}/lib/electron \ + -c.electronDist=${electron}/libexec/electron \ -c.electronVersion=${electron.version} runHook postBuild diff --git a/pkgs/applications/virtualization/podman-desktop/default.nix b/pkgs/applications/virtualization/podman-desktop/default.nix index 30dd54ba85ce3..412db059eac77 100644 --- a/pkgs/applications/virtualization/podman-desktop/default.nix +++ b/pkgs/applications/virtualization/podman-desktop/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { yarn --offline run build yarn --offline run electron-builder --dir \ --config .electron-builder.config.cjs \ - -c.electronDist=${electron}/lib/electron \ + -c.electronDist=${electron}/libexec/electron \ -c.electronVersion=${electron.version} runHook postBuild diff --git a/pkgs/development/tools/electron-fiddle/default.nix b/pkgs/development/tools/electron-fiddle/default.nix index eb4874750faec..5fe0a88f25286 100644 --- a/pkgs/development/tools/electron-fiddle/default.nix +++ b/pkgs/development/tools/electron-fiddle/default.nix @@ -61,7 +61,7 @@ let patchShebangs node_modules mkdir -p ~/.cache/electron/${electronDummyHash} - cp -ra '${electron}/lib/electron' "$TMPDIR/electron" + cp -ra '${electron}/libexec/electron' "$TMPDIR/electron" chmod -R u+w "$TMPDIR/electron" (cd "$TMPDIR/electron" && zip -0Xr ~/.cache/electron/${electronDummyHash}/${electronDummyFilename} .) diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index 34b7f239ecfe4..615ec9243bb2d 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -82,25 +82,22 @@ let wrapGAppsHook ]; - dontWrapGApps = true; # electron is in lib, we need to wrap it manually - dontUnpack = true; dontBuild = true; installPhase = '' - mkdir -p $out/lib/electron $out/bin - unzip -d $out/lib/electron $src - ln -s $out/lib/electron/electron $out/bin + mkdir -p $out/libexec/electron $out/bin + unzip -d $out/libexec/electron $src + ln -s $out/libexec/electron/electron $out/bin + chmod u-x $out/libexec/electron/*.so* ''; postFixup = '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}:${electronLibPath}:$out/lib/electron" \ - $out/lib/electron/electron \ - ${lib.optionalString (lib.versionAtLeast version "15.0.0") "$out/lib/electron/chrome_crashpad_handler" } - - wrapProgram $out/lib/electron/electron "''${gappsWrapperArgs[@]}" + --set-rpath "${atomEnv.libPath}:${electronLibPath}:$out/libexec/electron" \ + $out/libexec/electron/.electron-wrapped \ + ${lib.optionalString (lib.versionAtLeast version "15.0.0") "$out/libexec/electron/.chrome_crashpad_handler-wrapped" } ''; }; diff --git a/pkgs/development/tools/redisinsight/default.nix b/pkgs/development/tools/redisinsight/default.nix index bb96df683e275..5c4609e248d85 100644 --- a/pkgs/development/tools/redisinsight/default.nix +++ b/pkgs/development/tools/redisinsight/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { yarn --offline electron-builder \ --dir ${if stdenv.isDarwin then "--macos" else "--linux"} ${if stdenv.hostPlatform.isAarch64 then "--arm64" else "--x64"} \ - -c.electronDist=${electron}/lib/electron \ + -c.electronDist=${electron}/libexec/electron \ -c.electronVersion=${electron.version} runHook postBuild diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index a9b902f80d3bc..b962b06e48cd6 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -122,7 +122,7 @@ buildNpmPackage' { npm exec electron-builder -- \ --dir \ - -c.electronDist=${electron}/lib/electron \ + -c.electronDist=${electron}/libexec/electron \ -c.electronVersion=${electron.version} popd |