Update and fix nix flake

kit-sdq · Oct 4, 2024 · 1811a81 · 1811a81
1 parent b2f0eb8
commit 1811a81
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 16 deletions.
diff --git a/.direnv/flake-profile b/.direnv/flake-profile
diff --git a/.direnv/flake-profile-3-link b/.direnv/flake-profile-3-link
diff --git a/.gitignore b/.gitignore
@@ -181,4 +181,7 @@ gradle-app.setting
 exampleProject/
 
 grading-config-example.json
-.intellijPlatform/
+.intellijPlatform/
+
+# Direnv state
+.direnv/
diff --git a/build.gradle b/build.gradle
@@ -31,6 +31,10 @@ dependencies {
         bundledPlugin("com.intellij.java")
         bundledPlugin("org.jetbrains.idea.maven")
         instrumentationTools()
+        def localJbr = System.getenv("LOCAL_JBR")
+        if (localJbr != null) {
+            jetbrainsRuntimeLocal(localJbr)
+        }
     }
     implementation 'edu.kit.kastel.sdq:artemis4j:7.5.0-SNAPSHOT'
     // Tests

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -5,12 +5,12 @@
 
   outputs = { self, nixpkgs }:
     let
-      javaVersion = 17; # Change this value to update the whole stack
+      javaVersion = 21; # Change this value to update the whole stack
       overlays = [
         (final: prev: rec {
           jdk = prev."jdk${toString javaVersion}";
           gradle = prev.gradle.override { java = jdk; };
-          maven = prev.maven.override { inherit jdk; };
+          maven = prev.maven.override { jdk_headless = jdk; };
         })
       ];
       supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
@@ -22,17 +22,13 @@
       devShells = forEachSupportedSystem ({ pkgs }: {
         default = pkgs.mkShell {
           packages = with pkgs; [
-            gradle 
-            jdk 
-            maven 
+            jdk
+            gradle
+            maven
             jdt-language-server
           ];
 
-          #NIX_LD_LIBRARY_PATH = lib.makeLibraryPath [
-          #  pkgs.cc.cc
-          #];
-
-          # NIX_LD = builtins.readFile "${pkgs.cc}/nix-support/dynamic-linker";
+          LOCAL_JBR = pkgs.jetbrains.jdk;
         };
       });
     };