Unverified Commit 1443ffe2 authored by Yorick's avatar Yorick Committed by GitHub
Browse files

Merge pull request #246243 from yu-re-ka/electron-libexec 

electron-bin: place electron files in libexec/
parents 6fed5bca 0ec0e829

nixos/doc/manual/release-notes/rl-2311.section.md

+2 −0
Original line number Diff line number Diff line
@@ -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`.

pkgs/applications/graphics/drawio/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

pkgs/applications/misc/kuro/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

pkgs/applications/virtualization/podman-desktop/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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