diff --git a/pkgs/games/r2modman/default.nix b/pkgs/games/r2modman/default.nix index 72e3027be6b3..b330b92305a5 100644 --- a/pkgs/games/r2modman/default.nix +++ b/pkgs/games/r2modman/default.nix @@ -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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91535dc67b97..a61304f86ec3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };