From 18c9fb4b5ec5eb35cde802f334261ac5d450a704 Mon Sep 17 00:00:00 2001 From: sadan <117494111+sadan4@users.noreply.github.com> Date: Wed, 11 Dec 2024 19:20:06 -0500 Subject: [PATCH] i love java --- boxes/desktop/configuration.nix | 2 ++ common/users/homeModules/dev/cpp.nix | 5 +++-- common/users/homeModules/dev/default.nix | 4 +++- common/users/homeModules/dev/jvm.nix | 20 ++++++++++++++++++-- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/boxes/desktop/configuration.nix b/boxes/desktop/configuration.nix index 5cdf5de..405f959 100644 --- a/boxes/desktop/configuration.nix +++ b/boxes/desktop/configuration.nix @@ -62,6 +62,8 @@ #LD fix programs.nix-ld.enable = true; programs.nix-ld.libraries = with pkgs; [ + graalvm-ce + zlib.static libGL alsa-lib expat diff --git a/common/users/homeModules/dev/cpp.nix b/common/users/homeModules/dev/cpp.nix index 330d441..cbdd99a 100644 --- a/common/users/homeModules/dev/cpp.nix +++ b/common/users/homeModules/dev/cpp.nix @@ -3,7 +3,8 @@ packages = with pkgs; [ meson cmake - clang + # clang + libgcc glib glibc unstable.llvmPackages_19.clang-tools @@ -15,4 +16,4 @@ }; }; }; -} \ No newline at end of file +} diff --git a/common/users/homeModules/dev/default.nix b/common/users/homeModules/dev/default.nix index 91f025f..4166f45 100644 --- a/common/users/homeModules/dev/default.nix +++ b/common/users/homeModules/dev/default.nix @@ -2,7 +2,9 @@ home = { packages = with pkgs; [ gnumake + binutils linuxHeaders + man-pages ]; }; -} \ No newline at end of file +} diff --git a/common/users/homeModules/dev/jvm.nix b/common/users/homeModules/dev/jvm.nix index fe380de..7beeaf7 100644 --- a/common/users/homeModules/dev/jvm.nix +++ b/common/users/homeModules/dev/jvm.nix @@ -1,12 +1,28 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +let + g = (pkgs.gradle.override { + javaToolchains = [ pkgs.graalvm-ce ]; + }); +in +{ imports = [ ./ide/jb/idea.nix ./ide/jb/androidStudio.nix ]; home = { + sessionVariables = { + GRAALVM_HOME = "${pkgs.graalvm-ce}"; + }; + file = { + gradleIntellij = { + source = "${pkgs.graalvm-ce}"; + target = ".local/graalvm"; + }; + }; packages = with pkgs; [ - gradle jadx + g + kotlin ]; }; programs = {