msfjarvis
/
dotfiles
mirror of https://github.com/msfjarvis/dotfiles.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reapply "nix: move to JDK 22" 

This reverts commit 5923066630.
This commit is contained in:
Harsh Shandilya 2024-04-26 23:26:34 +05:30
parent b3a7e9f78d
commit 70a2d37455
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/nixos/profiles/desktop/android-dev.nix
View File

@ -5,7 +5,7 @@
...
}: let
cfg = config.profiles.desktop;
defaultJdk = pkgs.openjdk21;
defaultJdk = pkgs.openjdk22;
toolchains = [pkgs.openjdk17 defaultJdk];
in {
options.profiles.desktop.android-dev = with lib; {

8
overlays/default/default.nix
View File

@ -1,10 +1,10 @@
{inputs, ...}: _final: prev: {
attic = inputs.attic.packages.${prev.system}.attic-client;
# Force the use of the JDK we're using everywhere else
jdk = prev.openjdk21;
jdk_headless = prev.openjdk21_headless;
jre = prev.openjdk21;
jre_headless = prev.openjdk21_headless;
jdk = prev.openjdk22;
jdk_headless = prev.openjdk22_headless;
jre = prev.openjdk22;
jre_headless = prev.openjdk22_headless;
# Silence warnings about existing files
megatools = prev.megatools.overrideAttrs (_: {
patches = [./megatools.patch];

2
systems/x86_64-linux/ryzenbox/default.nix
View File

@ -114,7 +114,7 @@
# Minecraft
mcaselector
(prismlauncher.override {
jdks = [openjdk21];
jdks = [openjdk22];
withWaylandGLFW = config.profiles.desktop.gnome3.enable;
})
];