Use same jre version on CI and in nix shell

softwaremill · Sep 24, 2023 · 4e17861 · 4e17861
1 parent fefc548
commit 4e17861
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/flake.nix b/flake.nix
@@ -6,20 +6,18 @@
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs { inherit system; };
-        shellPackages = [
-          "jre"
-          "sbt"
-          "nodejs"
-          "yarn"
-        ];
       in
       {
         devShell = pkgs.mkShell {
-          buildInputs = map (pkgName: pkgs.${pkgName}) shellPackages;
+          buildInputs = with pkgs; [
+            (sbt.override {
+              jre = temurin-jre-bin-17;
+            })
+            nodejs
+            yarn
+          ];
           welcomeMessage = ''
             Welcome to the Diffx Nix shell! 👋
-            Available packages:
-            ${builtins.concatStringsSep "\n" (map (n : "- ${n}") shellPackages)}
           '';
 
           shellHook = ''
@@ -28,4 +26,5 @@
         };
       }
     );
-}
+}
+