BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
r2modman: update electron version
This commit is contained in:
Weijia Wang 2023-12-19 04:04:06 +01:00 committed by GitHub
commit a81de6fad4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/games/r2modman/default.nix
View file

@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
done done
) )
makeWrapper '${electron}/bin/electron' "$out/bin/r2modman" \ makeWrapper '${lib.getExe electron}' "$out/bin/r2modman" \
--inherit-argv0 \ --inherit-argv0 \
--add-flags "$out/share/r2modman" \ --add-flags "$out/share/r2modman" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
@ -114,5 +114,6 @@ stdenv.mkDerivation rec {
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ aidalgol huantian ]; maintainers = with maintainers; [ aidalgol huantian ];
inherit (electron.meta) platforms; inherit (electron.meta) platforms;
mainProgram = pname;
}; };
} }

5
pkgs/top-level/all-packages.nix
View file

@ -38235,10 +38235,7 @@ with pkgs;
r2mod_cli = callPackage ../games/r2mod_cli { }; r2mod_cli = callPackage ../games/r2mod_cli { };
r2modman = callPackage ../games/r2modman { r2modman = callPackage ../games/r2modman { };
# Electron 26 has regressions making applications unusable.
electron = electron_25;
};
racer = callPackage ../games/racer { }; racer = callPackage ../games/racer { };