From 9fc6d24290f951567e56956251c5813fe863d312 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Fri, 11 Feb 2022 09:54:51 +0100
Subject: [PATCH] Shell changes

---
 shells/dodona.nix |  2 +-
 shells/javafx.nix | 16 +++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/shells/dodona.nix b/shells/dodona.nix
index 0c525c05..19884f16 100644
--- a/shells/dodona.nix
+++ b/shells/dodona.nix
@@ -6,7 +6,7 @@ pkgs.mkShell {
     chromedriver
     libmysqlclient
     nodejs-14_x
-    ruby_2_7
+    ruby_3_0
     yarn
     zlib
     (
diff --git a/shells/javafx.nix b/shells/javafx.nix
index 56bf2e0d..7d1a2651 100644
--- a/shells/javafx.nix
+++ b/shells/javafx.nix
@@ -1,25 +1,19 @@
 let
-  pkgs = import <nixpkgs> { config.permittedInsecurePackages = [ "ffmpeg-3.4.8" ]; };
-  extraRpath = pkgs.lib.strings.makeLibraryPath (with pkgs; [ ffmpeg_3 ]);
-  java = pkgs.writeShellScriptBin "java" ''
-    old_path="$(patchelf --print-rpath ${pkgs.jdk11}/bin/java)"
-    LD_LIBRARY_PATH="$old_path:${extraRpath}" ${pkgs.jdk11}/bin/java $@
-  '';
+  pkgs = import <nixpkgs> { };
 in
 pkgs.mkShell {
   buildInputs = with pkgs; [
-    java
     (
       pkgs.writeShellScriptBin "compile" ''
-        find src -name '*.java' -print0 | xargs --no-run-if-empty -0 ${jdk11}/bin/javac -d out -sourcepath src
+        find src -name '*.java' -print0 | xargs --no-run-if-empty -0 ${jdk17}/bin/javac -d out -sourcepath src
         find src -type d -printf '%P\0' | xargs -0 -I \{\} mkdir -p out/\{\}
         find resources -type d -printf '%P\0' | xargs -0 -I \{\} mkdir -p out/\{\}
         find src -type f -not -name '*.java' -printf '%P\0' | xargs -0 -I \{\} cp src/\{\} out/\{\}
         find resources -type f -not -name '*.java' -printf '%P\0' | xargs -0 -I \{\} cp resources/\{\} out/\{\}
-        (cd out && ${java}/bin/java polis.Main)
+        (cd out && ${jdk17}/bin/java polis.Main)
       ''
     )
-    jdk11
-    openjfx11
+    jdk17
+    openjfx17
   ];
 }