chore!: switch to Qt 6 by default
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
		| @@ -174,7 +174,7 @@ set(Launcher_SUBREDDIT_URL "https://www.reddit.com/r/PrismLauncher/" CACHE STRIN | ||||
|  | ||||
| # Builds | ||||
| set(Launcher_FORCE_BUNDLED_LIBS OFF CACHE BOOL "Prevent using system libraries, if they are available as submodules") | ||||
| set(Launcher_QT_VERSION_MAJOR "5" CACHE STRING "Major Qt version to build against") | ||||
| set(Launcher_QT_VERSION_MAJOR "6" CACHE STRING "Major Qt version to build against") | ||||
|  | ||||
| # API Keys | ||||
| # NOTE: These API keys are here for convenience. If you rebrand this software or intend to break the terms of service | ||||
|   | ||||
| @@ -32,6 +32,7 @@ modules: | ||||
|     config-opts: | ||||
|       - -DLauncher_BUILD_PLATFORM=flatpak | ||||
|       - -DCMAKE_BUILD_TYPE=Debug | ||||
|       - -DLauncher_QT_VERSION_MAJOR=5 | ||||
|     build-options: | ||||
|       env: | ||||
|         JAVA_HOME: /usr/lib/sdk/openjdk17/jvm/openjdk-17 | ||||
|   | ||||
| @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { | ||||
|   ] ++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland; | ||||
|  | ||||
|   cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ] | ||||
|     ++ lib.optionals (lib.versionAtLeast qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=6" ]; | ||||
|     ++ lib.optionals (lib.versionOlder qtbase.version "6") [ "-DLauncher_QT_VERSION_MAJOR=5" ]; | ||||
|   dontWrapQtApps = true; | ||||
|  | ||||
|   postUnpack = '' | ||||
|   | ||||
| @@ -39,6 +39,7 @@ parts: | ||||
|       - "-DCMAKE_BUILD_TYPE=RelWithDebInfo" | ||||
|       - "-DENABLE_LTO=ON" | ||||
|       - "-DLauncher_BUILD_PLATFORM=snap" | ||||
|       - "-DLauncher_QT_VERSION_MAJOR=5" | ||||
|  | ||||
| apps: | ||||
|   prismlauncher: | ||||
|   | ||||
		Reference in New Issue
	
	Block a user