diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a62699bad04..c4cf362e361 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5761,6 +5761,12 @@ githubId = 10353047; name = "Tobias Happ"; }; + getchoo = { + email = "getchoo@tuta.io"; + github = "getchoo"; + githubId = 48872998; + name = "Seth"; + }; gfrascadorio = { email = "gfrascadorio@tutanota.com"; github = "gfrascadorio"; diff --git a/pkgs/games/prismlauncher/default.nix b/pkgs/games/prismlauncher/default.nix index eb83de0d0b6..6b2b8c9c74e 100644 --- a/pkgs/games/prismlauncher/default.nix +++ b/pkgs/games/prismlauncher/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , cmake +, cmark , ninja , jdk17 , zlib @@ -24,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "prismlauncher-unwrapped"; - version = "6.3"; + version = "7.0"; src = fetchFromGitHub { owner = "PrismLauncher"; repo = "PrismLauncher"; rev = version; - sha256 = "sha256-7tptHKWkbdxTn6VIPxXE1K3opKRiUW2zv9r6J05dcS8="; + sha256 = "sha256-jBBHWN/ERUVzJAyebN7eFCODZg1P7QYPOBPIM+bIbak="; }; nativeBuildInputs = [ extra-cmake-modules cmake jdk17 ninja ]; @@ -40,12 +41,13 @@ stdenv.mkDerivation rec { quazip ghc_filesystem tomlplusplus + cmark ] ++ lib.optional gamemodeSupport gamemode; hardeningEnable = [ "pie" ]; cmakeFlags = lib.optionals (msaClientID != null) [ "-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" ]; postUnpack = '' rm -rf source/libraries/libnbtplusplus @@ -65,6 +67,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; changelog = "https://github.com/PrismLauncher/PrismLauncher/releases/tag/${version}"; license = licenses.gpl3Only; - maintainers = with maintainers; [ minion3665 Scrumplex ]; + maintainers = with maintainers; [ minion3665 Scrumplex getchoo ]; }; }