diff --git a/pkgs/tools/games/alice-tools/default.nix b/pkgs/tools/games/alice-tools/default.nix index 0aed7016feac..d5493dc63aa1 100644 --- a/pkgs/tools/games/alice-tools/default.nix +++ b/pkgs/tools/games/alice-tools/default.nix @@ -2,7 +2,6 @@ , lib , gitUpdater , fetchFromGitHub -, fetchpatch , meson , ninja , pkg-config @@ -21,33 +20,17 @@ assert withGUI -> qtbase != null && wrapQtAppsHook != null; stdenv.mkDerivation rec { - pname = "alice-tools"; - version = "0.12.1"; + pname = "alice-tools" + lib.optionalString withGUI "-qt${lib.versions.major qtbase.version}"; + version = "0.13.0"; src = fetchFromGitHub { owner = "nunuhara"; repo = "alice-tools"; rev = version; fetchSubmodules = true; - hash = "sha256-uXiNNneAOTDupgc+ZvaeRNbEQFJBv4ppdEc3kZeUsg8="; + hash = "sha256-DazWnBeI5XShkIx41GFZLP3BbE0O8T9uflvKIZUXCHo="; }; - patches = [ - # These two patches (one to alice-tools, one to a subproject) improve DCF & PCF parsing - # Remove them when version > 0.12.1 - (fetchpatch { - url = "https://github.com/nunuhara/alice-tools/commit/c800e85b37998d7a47060f5da4b1782d7201a042.patch"; - excludes = [ "subprojects/libsys4" ]; - hash = "sha256-R5ckFHqUWHdAPkFa53UbVeLgxJg/8qGLTQWwj5YRJc4="; - }) - (fetchpatch { - url = "https://github.com/nunuhara/libsys4/commit/cff2b826d1618fb17616cdd288ab0c50f35e8032.patch"; - stripLen = 1; - extraPrefix = "subprojects/libsys4/"; - hash = "sha256-CmetiVP2kGL+MwuE9OoEDrDFxzwWvv1TtZuq1li1uIw="; - }) - ]; - postPatch = lib.optionalString (withGUI && lib.versionAtLeast qtbase.version "6.0") '' substituteInPlace src/meson.build \ --replace qt5 qt6