Unverified Commit 44030d89 authored by Felix Bargfeldt's avatar Felix Bargfeldt Committed by GitHub
Browse files

mcpelauncher-{client,ui-qt}: 1.2.0-qt6 -> 1.3.0-qt6 (#404963)

parents af79f4ca 11f8d162

pkgs/by-name/mc/mcpelauncher-client/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 ];

pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix

+1 −12
Original line number Diff line number Diff line
@@ -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 = [