Merge pull request #54 from nartsisss/fix/overlays

fix: missing overlays, outdated inputs in java/kotlin
the-nix-way · Sep 12, 2024 · 16140e8 · 16140e8
2 parents 30ab9d5 + 423d98b
commit 16140e8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/java/flake.nix b/java/flake.nix
@@ -9,14 +9,14 @@
 
       supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
       forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
-        pkgs = import nixpkgs { inherit system; };
+        pkgs = import nixpkgs { inherit system; overlays = [ self.overlays.default ]; };
       });
     in
     {
       overlays.default =
         final: prev: rec {
           jdk = prev."jdk${toString javaVersion}";
-          maven = prev.maven.override { jre = jdk; };
+          maven = prev.maven.override { jdk_headless = jdk; };
           gradle = prev.gradle.override { java = jdk; };
         };
 

diff --git a/kotlin/flake.nix b/kotlin/flake.nix
@@ -9,7 +9,7 @@
 
       supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
       forEachSupportedSystem = f: nixpkgs.lib.genAttrs supportedSystems (system: f {
-        pkgs = import nixpkgs { inherit system; };
+        pkgs = import nixpkgs { inherit system; overlays = [ self.overlays.default ]; };
       });
     in
     {