diff --git a/pkgs/by-name/mc/mcpelauncher-client/package.nix b/pkgs/by-name/mc/mcpelauncher-client/package.nix index b9181d3d18ec..17e705fcd8d3 100644 --- a/pkgs/by-name/mc/mcpelauncher-client/package.nix +++ b/pkgs/by-name/mc/mcpelauncher-client/package.nix @@ -1,8 +1,8 @@ { lib, clangStdenv, + stdenv, fetchFromGitHub, - fetchpatch, cmake, pkg-config, openssl, @@ -18,12 +18,14 @@ withQtWebview ? true, withQtErrorWindow ? true, fetchzip, + zenity, + 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.3.0-qt6"; # NOTE: check mcpelauncher-ui-qt when updating src = fetchFromGitHub { @@ -31,25 +33,20 @@ clangStdenv.mkDerivation (finalAttrs: { repo = "mcpelauncher-manifest"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-PmCq6Zgtp17UV0kIbNouFwj/DMiTqwE31+tTb2LUp5o="; + hash = "sha256-/I6hCnRSFHX30Gd0jErx5Uy/o8JCdYexsMRDKMUOWWI="; }; - 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 ${lib.getExe zenity} + + substituteInPlace file-picker/src/file_picker_zenity.cpp \ + --replace-fail 'EXECUTABLE_NAME = "zenity"' 'EXECUTABLE_NAME = "${lib.getExe zenity}"' + ''; # FORTIFY_SOURCE breaks libc_shim and the project will fail to compile hardeningDisable = [ "fortify" ]; diff --git a/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix b/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix index 6867af4464ee..39ccb25196d6 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-OvzdXr2Q7PHonaQ+y3VeAODCCVWBwuSCgUW3GghA1Ys="; }; patches = [