From 22056c577e72228c449fd2042a296d35f0a5906f Mon Sep 17 00:00:00 2001
From: Mark Dickie <mark.dickie@gmail.com>
Date: Sun, 1 Feb 2026 15:49:47 +0100
Subject: [PATCH] Trying out some build fixes for hyprland

---
 flake.nix                         | 13 -------------
 modules/home-manager/hyprland.nix |  4 +++-
 modules/nixos/hyprland.nix        |  5 +++--
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/flake.nix b/flake.nix
index 3335038..d14b595 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,19 +41,6 @@
                 (final: prev: {
                   pyprland = pyprland.packages.${final.system}.default;
                   wiremix = wiremix.packages.${final.system}.default;
-                  glaze = prev.glaze.overrideAttrs (old: {
-                    propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ final.openssl ];
-                    cmakeFlags = (old.cmakeFlags or [ ]) ++ [ "-DGLAZE_ENABLE_OPENSSL=ON" ];
-                  });
-                  hyprland = inputs.hyprland.packages.${final.system}.hyprland.overrideAttrs (old: {
-                    # Ensure systemd support is enabled so UWSM can pass watchdog fd.
-                    buildInputs = (old.buildInputs or [ ]) ++ [ final.glaze final.systemd ];
-                    cmakeFlags = (old.cmakeFlags or [ ]) ++ [ "-DNO_SYSTEMD=OFF" ];
-                    postPatch = (old.postPatch or "") + ''
-                      # Ensure OpenSSL target exists before using glaze::glaze
-                      sed -i '1ifind_package(OpenSSL REQUIRED)' hyprpm/CMakeLists.txt
-                    '';
-                  });
                 })
               ];
             };
diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/hyprland.nix
index 5ab6593..6f86ee7 100644
--- a/modules/home-manager/hyprland.nix
+++ b/modules/home-manager/hyprland.nix
@@ -8,7 +8,9 @@ inputs:
   imports = [ ./hyprland/configuration.nix ];
   wayland.windowManager.hyprland = {
     enable = true;
-    package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+    systemd.enable = false;
+    package = null;
+    portalPackage = null;
   };
   services.hyprpolkitagent.enable = true;
 }
diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix
index b6bd8dd..26ebc75 100644
--- a/modules/nixos/hyprland.nix
+++ b/modules/nixos/hyprland.nix
@@ -7,7 +7,8 @@ inputs:
   programs.hyprland = {
     enable = true;
     xwayland.enable = true;
-    package = pkgs.hyprland;
-    portalPackage = pkgs.xdg-desktop-portal-hyprland; # Use stable nixpkgs version to fix Qt version mismatch
+    package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
+    portalPackage =
+      inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
   };
 }
-- 
2.51.2