From 3f85194c2a11c1eb0f8fe325348027cd84b84576 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 8 Mar 2025 23:49:35 +0800 Subject: [PATCH 1/5] mcpelauncher-ui-qt: 1.1.2-qt6 -> 1.2.0-qt6 Diff: https://github.com/minecraft-linux/mcpelauncher-ui-manifest/compare/v1.1.2-qt6...v1.2.0-qt6 Changelog: https://github.com/minecraft-linux/mcpelauncher-ui-manifest/releases/tag/v1.2.0-qt6 (cherry picked from commit 69f2c322627098189d1492063c0afcee0f442f47) --- pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix b/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix index 6867af4464ee..81352635f66d 100644 --- a/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix +++ b/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "mcpelauncher-ui-manifest"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-R9wE1lS7x1IIPgVahXjF5Yg2ca+GsiQuF41pWf2edXY="; + hash = "sha256-333PwfBWhdfJSi1XrJNHidMYZrzSReb8s4VxBASFQ6Q="; }; patches = [ From c0b64b298c6b9577d2f8cbec50768bce4f131cb8 Mon Sep 17 00:00:00 2001 From: Morxemplum Date: Wed, 23 Apr 2025 00:13:06 -0400 Subject: [PATCH 2/5] mcpelauncher-ui-qt: fix build on Qt 6.9 (cherry picked from commit 8923784c1365ed59297104df16dd8e2a310f9a28) --- pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix b/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix index 81352635f66d..d0c0241be79d 100644 --- a/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix +++ b/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix @@ -3,6 +3,7 @@ stdenv, mcpelauncher-client, fetchFromGitHub, + fetchpatch, cmake, pkg-config, zlib, @@ -27,6 +28,16 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./dont_download_glfw_ui.patch + # Qt 6.9 no longer implicitly converts non-char types (such as booleans) to + # construct a QChar. This leads to a build failure with Qt 6.9. Upstream + # has merged a patch, but has not yet formalized it through a release, so + # we must fetch it manually. Remove this fetch on the next point release. + (fetchpatch { + url = "https://github.com/minecraft-linux/mcpelauncher-ui-qt/commit/0526b1fd6234d84f63b216bf0797463f41d2bea0.diff"; + hash = "sha256-vL5iqbs50qVh4BKDxTOpCwFQWO2gLeqrVLfnpeB6Yp8="; + stripLen = 1; + extraPrefix = "mcpelauncher-ui-qt/"; + }) ]; nativeBuildInputs = [ From 2687373009f869bfe82f553572bde3e8caddef7d Mon Sep 17 00:00:00 2001 From: arexon Date: Wed, 29 Jan 2025 13:16:25 +0200 Subject: [PATCH 3/5] mcpelauncher-client: fix hard-coded paths (cherry picked from commit df24baa5c3873a1b46d027bd7868b1964c3ded5c) --- pkgs/by-name/mc/mcpelauncher-client/package.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/by-name/mc/mcpelauncher-client/package.nix b/pkgs/by-name/mc/mcpelauncher-client/package.nix index b9181d3d18ec..dba7dc1539e9 100644 --- a/pkgs/by-name/mc/mcpelauncher-client/package.nix +++ b/pkgs/by-name/mc/mcpelauncher-client/package.nix @@ -1,6 +1,7 @@ { lib, clangStdenv, + stdenv, fetchFromGitHub, fetchpatch, cmake, @@ -18,6 +19,8 @@ withQtWebview ? true, withQtErrorWindow ? true, fetchzip, + zenity, + xdg-utils, }: # gcc doesn't support __has_feature @@ -51,6 +54,16 @@ clangStdenv.mkDerivation (finalAttrs: { }) ]; + # Path hard-coded paths. + postPatch = lib.optionalString stdenv.isLinux '' + substituteInPlace mcpelauncher-client/src/jni/main_activity.cpp \ + --replace-fail /usr/bin/xdg-open ${xdg-utils}/bin/xdg-open \ + --replace-fail /usr/bin/zenity ${zenity}/bin/zenity + + substituteInPlace file-picker/src/file_picker_zenity.cpp \ + --replace-fail /usr/bin/zenity ${zenity}/bin/zenity + ''; + # FORTIFY_SOURCE breaks libc_shim and the project will fail to compile hardeningDisable = [ "fortify" ]; From 95a344d410d02567aa631814a3566722ce0b6298 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 8 Mar 2025 23:45:47 +0800 Subject: [PATCH 4/5] mcpelauncher-client: 1.1.2-qt6 -> 1.2.0-qt6 Diff: https://github.com/minecraft-linux/mcpelauncher-manifest/compare/v1.1.2-qt6...v1.2.0-qt6 Changelog: https://github.com/minecraft-linux/mcpelauncher-manifest/releases/tag/v1.2.0-qt6 (cherry picked from commit 2c2037174877e4896ad407921ba39957c0b4b635) --- .../mc/mcpelauncher-client/package.nix | 28 ++++--------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/mc/mcpelauncher-client/package.nix b/pkgs/by-name/mc/mcpelauncher-client/package.nix index dba7dc1539e9..0c2efbb4a994 100644 --- a/pkgs/by-name/mc/mcpelauncher-client/package.nix +++ b/pkgs/by-name/mc/mcpelauncher-client/package.nix @@ -3,7 +3,6 @@ clangStdenv, stdenv, fetchFromGitHub, - fetchpatch, cmake, pkg-config, openssl, @@ -23,10 +22,10 @@ xdg-utils, }: -# gcc doesn't support __has_feature +# Bionic libc part doesn't compile with GCC clangStdenv.mkDerivation (finalAttrs: { pname = "mcpelauncher-client"; - version = "1.1.2-qt6"; + version = "1.2.0-qt6"; # NOTE: check mcpelauncher-ui-qt when updating src = fetchFromGitHub { @@ -34,34 +33,19 @@ clangStdenv.mkDerivation (finalAttrs: { repo = "mcpelauncher-manifest"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-PmCq6Zgtp17UV0kIbNouFwj/DMiTqwE31+tTb2LUp5o="; + hash = "sha256-SyIiBUZCGcV4NFD7IcQv8YdRkDGhkBeqE0qVsKp+44Y="; }; - patches = [ - ./dont_download_glfw_client.patch - # These are upcoming changes that have been merged upstream. Once these get in a release, remove these patches. - (fetchpatch { - url = "https://github.com/minecraft-linux/game-window/commit/feea8c0e0720eea7093ed95745c17f36d6c40671.diff"; - hash = "sha256-u4uveoKwwklEooT+i+M9kZ0PshjL1IfWhlltmulsQJo="; - stripLen = 1; - extraPrefix = "game-window/"; - }) - (fetchpatch { - url = "https://github.com/minecraft-linux/mcpelauncher-client/commit/db9c31e46d7367867c85a0d0aba42c8144cdf795.diff"; - hash = "sha256-za/9oZYwKCYyZ1BXQ/zeEjRy81B1NpTlPHEfWAOtzHk="; - stripLen = 1; - extraPrefix = "mcpelauncher-client/"; - }) - ]; + patches = [ ./dont_download_glfw_client.patch ]; # Path hard-coded paths. postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace mcpelauncher-client/src/jni/main_activity.cpp \ --replace-fail /usr/bin/xdg-open ${xdg-utils}/bin/xdg-open \ - --replace-fail /usr/bin/zenity ${zenity}/bin/zenity + --replace-fail /usr/bin/zenity ${lib.getExe zenity} substituteInPlace file-picker/src/file_picker_zenity.cpp \ - --replace-fail /usr/bin/zenity ${zenity}/bin/zenity + --replace-fail 'EXECUTABLE_NAME = "zenity"' 'EXECUTABLE_NAME = "${lib.getExe zenity}"' ''; # FORTIFY_SOURCE breaks libc_shim and the project will fail to compile From 4de1e6816f76f11a3d509542c48f9b97a3ce4ed5 Mon Sep 17 00:00:00 2001 From: Tert0 Date: Wed, 7 May 2025 17:56:11 +0200 Subject: [PATCH 5/5] mcpelauncher-{client,ui-qt}: 1.2.0-qt6 -> 1.3.0-qt6 (cherry picked from commit 11f8d162a742de88871d2c24e1fbb4c249f490db) --- pkgs/by-name/mc/mcpelauncher-client/package.nix | 4 ++-- pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix | 13 +------------ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/mc/mcpelauncher-client/package.nix b/pkgs/by-name/mc/mcpelauncher-client/package.nix index 0c2efbb4a994..17e705fcd8d3 100644 --- a/pkgs/by-name/mc/mcpelauncher-client/package.nix +++ b/pkgs/by-name/mc/mcpelauncher-client/package.nix @@ -25,7 +25,7 @@ # Bionic libc part doesn't compile with GCC clangStdenv.mkDerivation (finalAttrs: { pname = "mcpelauncher-client"; - version = "1.2.0-qt6"; + version = "1.3.0-qt6"; # NOTE: check mcpelauncher-ui-qt when updating src = fetchFromGitHub { @@ -33,7 +33,7 @@ clangStdenv.mkDerivation (finalAttrs: { repo = "mcpelauncher-manifest"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-SyIiBUZCGcV4NFD7IcQv8YdRkDGhkBeqE0qVsKp+44Y="; + hash = "sha256-/I6hCnRSFHX30Gd0jErx5Uy/o8JCdYexsMRDKMUOWWI="; }; patches = [ ./dont_download_glfw_client.patch ]; diff --git a/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix b/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix index d0c0241be79d..39ccb25196d6 100644 --- a/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix +++ b/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix @@ -3,7 +3,6 @@ stdenv, mcpelauncher-client, fetchFromGitHub, - fetchpatch, cmake, pkg-config, zlib, @@ -23,21 +22,11 @@ stdenv.mkDerivation (finalAttrs: { repo = "mcpelauncher-ui-manifest"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-333PwfBWhdfJSi1XrJNHidMYZrzSReb8s4VxBASFQ6Q="; + hash = "sha256-OvzdXr2Q7PHonaQ+y3VeAODCCVWBwuSCgUW3GghA1Ys="; }; patches = [ ./dont_download_glfw_ui.patch - # Qt 6.9 no longer implicitly converts non-char types (such as booleans) to - # construct a QChar. This leads to a build failure with Qt 6.9. Upstream - # has merged a patch, but has not yet formalized it through a release, so - # we must fetch it manually. Remove this fetch on the next point release. - (fetchpatch { - url = "https://github.com/minecraft-linux/mcpelauncher-ui-qt/commit/0526b1fd6234d84f63b216bf0797463f41d2bea0.diff"; - hash = "sha256-vL5iqbs50qVh4BKDxTOpCwFQWO2gLeqrVLfnpeB6Yp8="; - stripLen = 1; - extraPrefix = "mcpelauncher-ui-qt/"; - }) ]; nativeBuildInputs = [