diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix index 56c617c0768e..489f32863563 100644 --- a/pkgs/by-name/mi/miracle-wm/package.nix +++ b/pkgs/by-name/mi/miracle-wm/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, gitUpdater, nixosTests, boost, @@ -12,6 +11,8 @@ glib, glm, gtest, + gtk4, + gtk4-layer-shell, json_c, libevdev, libglvnd, @@ -29,31 +30,21 @@ wasmedge, wayland, wayland-scanner, + wrapGAppsHook4, yaml-cpp, }: stdenv.mkDerivation (finalAttrs: { pname = "miracle-wm"; - version = "0.9.1"; + version = "0.10.1"; src = fetchFromGitHub { owner = "miracle-wm-org"; repo = "miracle-wm"; tag = "v${finalAttrs.version}"; - hash = "sha256-7JtdSopKBHfFK0KsV0+9OxrOx3vrSydmZSmAiBvKQiI="; + hash = "sha256-htFgvXYgxQXV2U3F+tXEoaTb0udc2H1aHsIg5E8nRL8="; }; - patches = [ - (fetchpatch { - name = "0001-miracle-wm-mir2.28.patch"; - url = "https://github.com/miracle-wm-org/miracle-wm/commit/0fcfb54c59327d0776f6e8074e885080731a95c4.patch"; - excludes = [ - ".github/workflows/test-deb-install.yml" - ]; - hash = "sha256-HuXwPkM0whLFIy8HM6n9bG9I/DZOuzAajmDpJMZt9BQ="; - }) - ]; - postPatch = '' substituteInPlace CMakeLists.txt \ --replace-fail 'DESTINATION lib' 'DESTINATION ''${CMAKE_INSTALL_LIBDIR}' \ @@ -67,12 +58,15 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper pkg-config wayland-scanner + wrapGAppsHook4 ]; buildInputs = [ boost glib glm + gtk4 + gtk4-layer-shell json_c libevdev libglvnd @@ -96,11 +90,15 @@ stdenv.mkDerivation (finalAttrs: { checkInputs = [ gtest ]; + # Manually wrapping the few binaries that needs it + dontWrapGApps = true; + cmakeFlags = [ + (lib.cmakeBool "BUILD_DEBUG_OVERLAY" true) + (lib.cmakeBool "BUILD_ERROR_REPORTER" true) (lib.cmakeBool "ENABLE_LTO" true) (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) - # https://github.com/miracle-wm-org/miracle-wm/issues/865 - (lib.cmakeBool "FEATURE_PLUGIN_SYSTEM" false) + (lib.cmakeBool "FEATURE_PLUGIN_SYSTEM" true) (lib.cmakeBool "SYSTEMD_INTEGRATION" true) (lib.cmakeBool "END_TO_END_TESTS" finalAttrs.finalPackage.doCheck) ]; @@ -119,6 +117,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' patchShebangs $out/libexec/miracle-wm-session-setup + wrapProgram $out/libexec/miracle-wm-session-setup \ --prefix PATH : "$out/bin:${ lib.makeBinPath [ @@ -127,6 +126,9 @@ stdenv.mkDerivation (finalAttrs: { systemd # systemctl ] }" + + wrapGApp $out/bin/miracle-wm-basic-error-reporter + wrapGApp $out/bin/miracle-wm-debug-overlay ''; passthru = {