Unverified Commit a81de6fa authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #273455 from aidalgol/r2modman-electron-update 

r2modman: update electron version
parents db41f0d3 af559e0e

pkgs/games/r2modman/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec { 
      done

    )



    makeWrapper '${electron}/bin/electron' "$out/bin/r2modman" \

    makeWrapper '${lib.getExe electron}' "$out/bin/r2modman" \

      --inherit-argv0 \

      --add-flags "$out/share/r2modman" \

      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
@@ -114,5 +114,6 @@ stdenv.mkDerivation rec { 
    license = licenses.mit;

    maintainers = with maintainers; [ aidalgol huantian ];

    inherit (electron.meta) platforms;

    mainProgram = pname;

  };

}

pkgs/top-level/all-packages.nix

+1 −4
Original line number Diff line number Diff line
@@ -38235,10 +38235,7 @@ with pkgs; 














  r2mod_cli = callPackage ../games/r2mod_cli { };



























  r2modman = callPackage ../games/r2modman {













    # Electron 26 has regressions making applications unusable.













    electron = electron_25;













  };













  r2modman = callPackage ../games/r2modman { };





























  racer = callPackage ../games/racer { };