Merge pull request #647 from Scrumplex/update-flake

nix/default.nix

@@ -2,7 +2,7 @@
 , stdenv
 , cmake
 , jdk8
-, jdk
+, jdk17
 , zlib
 , file
 , wrapQtAppsHook
@@ -16,15 +16,15 @@
 , glfw
 , openal
 , extra-cmake-modules
+, tomlplusplus
 , ghc_filesystem
 , msaClientID ? ""
-, jdks ? [ jdk jdk8 ]
+, jdks ? [ jdk17 jdk8 ]
 
   # flake
 , self
 , version
 , libnbtplusplus
-, tomlplusplus
 }:
 
 stdenv.mkDerivation rec {
@@ -33,13 +33,14 @@ stdenv.mkDerivation rec {
 
   src = lib.cleanSource self;
 
-  nativeBuildInputs = [ extra-cmake-modules cmake file jdk wrapQtAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules cmake file jdk17 wrapQtAppsHook ];
   buildInputs = [
     qtbase
     qtsvg
     zlib
     quazip
     ghc_filesystem
+    tomlplusplus
   ] ++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland;
 
   cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]
@@ -52,11 +53,6 @@ stdenv.mkDerivation rec {
     ln -s ${libnbtplusplus}/* source/libraries/libnbtplusplus
     chmod -R +r+w source/libraries/libnbtplusplus
     chown -R $USER: source/libraries/libnbtplusplus
-    rm -rf source/libraries/tomlplusplus
-    mkdir source/libraries/tomlplusplus
-    ln -s ${tomlplusplus}/* source/libraries/tomlplusplus
-    chmod -R +r+w source/libraries/tomlplusplus
-    chown -R $USER: source/libraries/tomlplusplus
   '';
 
   postInstall =