fix(nix): use jdk17 instead of jdk
See NixOS/nixpkgs#206806 Co-authored-by: Infinidoge <infinidoge@doge-inc.net> Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
		@@ -2,7 +2,7 @@
 | 
				
			|||||||
, stdenv
 | 
					, stdenv
 | 
				
			||||||
, cmake
 | 
					, cmake
 | 
				
			||||||
, jdk8
 | 
					, jdk8
 | 
				
			||||||
, jdk
 | 
					, jdk17
 | 
				
			||||||
, zlib
 | 
					, zlib
 | 
				
			||||||
, file
 | 
					, file
 | 
				
			||||||
, wrapQtAppsHook
 | 
					, wrapQtAppsHook
 | 
				
			||||||
@@ -18,7 +18,7 @@
 | 
				
			|||||||
, extra-cmake-modules
 | 
					, extra-cmake-modules
 | 
				
			||||||
, ghc_filesystem
 | 
					, ghc_filesystem
 | 
				
			||||||
, msaClientID ? ""
 | 
					, msaClientID ? ""
 | 
				
			||||||
, jdks ? [ jdk jdk8 ]
 | 
					, jdks ? [ jdk17 jdk8 ]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # flake
 | 
					  # flake
 | 
				
			||||||
, self
 | 
					, self
 | 
				
			||||||
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  src = lib.cleanSource self;
 | 
					  src = lib.cleanSource self;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  nativeBuildInputs = [ extra-cmake-modules cmake file jdk wrapQtAppsHook ];
 | 
					  nativeBuildInputs = [ extra-cmake-modules cmake file jdk17 wrapQtAppsHook ];
 | 
				
			||||||
  buildInputs = [
 | 
					  buildInputs = [
 | 
				
			||||||
    qtbase
 | 
					    qtbase
 | 
				
			||||||
    qtsvg
 | 
					    qtsvg
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user