From b864ff41124b918abc6ccca054cc5ae8859280fe Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 27 Aug 2025 16:07:41 +0200 Subject: [PATCH] miracle-wm: 0.6.2 -> 0.6.2-unstable-2025-08-27 Fixes compatibility with Mir 2.22.0 --- pkgs/by-name/mi/miracle-wm/package.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix index f3428589e621..46f672a3e11f 100644 --- a/pkgs/by-name/mi/miracle-wm/package.nix +++ b/pkgs/by-name/mi/miracle-wm/package.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchFromGitHub, - gitUpdater, + unstableGitUpdater, nixosTests, boost, cmake, @@ -31,20 +31,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "miracle-wm"; - version = "0.6.2"; + version = "0.6.2-unstable-2025-08-27"; src = fetchFromGitHub { owner = "miracle-wm-org"; repo = "miracle-wm"; - tag = "v${finalAttrs.version}"; - hash = "sha256-zUqW21gZC7J/E0cld11N6OyclpgKCh4F7m/soBi3N1E="; + rev = "0a55a023adf511b042f922aeba666744805be988"; + hash = "sha256-yf7knY1tNFeCwePsfTAMAxIma+ZeZUvqpMJe7ABahEw="; }; postPatch = '' substituteInPlace CMakeLists.txt \ --replace-fail 'DESTINATION /usr/lib' 'DESTINATION ''${CMAKE_INSTALL_LIBDIR}' \ --replace-fail '-march=native' '# -march=native' \ - --replace-fail '-flto' '# -flto' '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' substituteInPlace CMakeLists.txt \ @@ -89,7 +88,9 @@ stdenv.mkDerivation (finalAttrs: { checkInputs = [ gtest ]; cmakeFlags = [ + (lib.cmakeBool "ENABLE_LTO" true) (lib.cmakeBool "SYSTEMD_INTEGRATION" true) + (lib.cmakeBool "END_TO_END_TESTS" finalAttrs.finalPackage.doCheck) ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; @@ -97,6 +98,8 @@ stdenv.mkDerivation (finalAttrs: { checkPhase = '' runHook preCheck + export XDG_RUNTIME_DIR=$TMP + ./tests/miracle-wm-tests runHook postCheck @@ -115,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = gitUpdater { rev-prefix = "v"; }; + updateScript = unstableGitUpdater { tagPrefix = "v"; }; providedSessions = [ "miracle-wm" ]; tests.vm = nixosTests.miracle-wm; };