From 04f7f5d1bdb91772f4df6c2bf20331dadacb9b77 Mon Sep 17 00:00:00 2001 From: Mark Dickie Date: Mon, 26 Jan 2026 15:40:43 +0100 Subject: [PATCH] Add glaze to dependencies for hyprland --- .cache/nix/fetcher-cache-v4.sqlite | Bin 0 -> 12288 bytes flake.lock | 66 ++++++++++++++--------------- flake.nix | 3 ++ modules/home-manager/hyprland.nix | 10 +++-- modules/nixos/hyprland.nix | 3 +- 5 files changed, 43 insertions(+), 39 deletions(-) create mode 100644 .cache/nix/fetcher-cache-v4.sqlite diff --git a/.cache/nix/fetcher-cache-v4.sqlite b/.cache/nix/fetcher-cache-v4.sqlite new file mode 100644 index 0000000000000000000000000000000000000000..04067fa5126b6074cd75cb7f52c8d59e23ee31c1 GIT binary patch literal 12288 zcmWCy^vNtqRY=P(%1ta$FlG>7U}9o$P*7lCU|?ckU|?oI07eD|1{MUD0mMh*Vr4Qh z=yi$k^8a99;^$!C=ion!Rn@5AXb6mkz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD z&?y8Oofz50#l;z$l1mbka#EcWlQSR$lXH-(V~DFlh@+E_s{&YDL4!*{K|vuUKQ}Qm z55y`-tte5*%P&#LE6vH#0ZV45R)S;{6cn&XmL=wtrh=uhNS0*grWThZ<`yVq=9Q$T zrxu}^Tu_vmn^;t-0J1>?;szZMN0UoalZj2-R-BO`GcP5zqPQ?8vm`Y>v9u%~%#R1V zJ>C#Zf%^3vprGXib@cfi8TeQ5JA(M5cr*k?Ltr!nMnhmU1V%$(Gz3ONU^E0qLtr!n zMnhmU1V%#uO9-Sgv1%7Ov!rL1_#_sW_~xf%re&t4R4WywmMK{&C0iz0q?(%>rCAu8 z7@4Ldn;R!tSeP1_rW%--TbiY%7?`Fd8Ce<`E7evjHZwG@%`C6+ z31ehcF4P5C6O>x!oL`z(LXH(hP`yf4My5t!bGg9%|8fTYa{hf-d^ajI8UmvsFd71* zAut*OqaiRF0;3@?8UmvsFd71*Aut*Oqagqo`61xOqFu;H@t6UVBa3n&XL@D{`C|eA Dn0d82 literal 0 HcmV?d00001 diff --git a/flake.lock b/flake.lock index 3bb1a82..4793bd7 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1765900596, - "narHash": "sha256-+hn8v9jkkLP9m+o0Nm5SiEq10W0iWDSotH2XfjU45fA=", + "lastModified": 1767654173, + "narHash": "sha256-mhG+EgXJU0hiFzX1dPqrVTw5geza/ZvJlRVMnxryBP4=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "d83c97f8f5c0aae553c1489c7d9eff3eadcadace", + "rev": "534c88e2f20ee728123464dba28c441d55be14c3", "type": "github" }, "original": { @@ -52,15 +52,15 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -168,11 +168,11 @@ ] }, "locked": { - "lastModified": 1763733840, - "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=", + "lastModified": 1768238867, + "narHash": "sha256-7pYinsOU0liNUzODFoDCx3ai+jqwDi39AIIuFgtYVnA=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a", + "rev": "583331e06581cf4a4113d5adafc969e821512c19", "type": "github" }, "original": { @@ -198,16 +198,16 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1767388857, - "narHash": "sha256-h70Tlpce8NEkwWqw/DDpeOKPzPyfq7P2t0HtGM5Z3Cw=", + "lastModified": 1769284926, + "narHash": "sha256-KqZHDwwVRq2I1RiNjh5XM6NOU51DA0EvAeYTcItBy8E=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "ab1d80f3d6aebd57a0971b53a1993b1c1dfe0b09", + "rev": "dd220efe7b1e292415bd0ea7161f63df9c95bfd3", "type": "github" }, "original": { "owner": "hyprwm", - "ref": "v0.53.1", + "ref": "v0.53.3", "repo": "Hyprland", "type": "github" } @@ -245,11 +245,11 @@ ] }, "locked": { - "lastModified": 1765643131, - "narHash": "sha256-CCGohW5EBIRy4B7vTyBMqPgsNcaNenVad/wszfddET0=", + "lastModified": 1767023960, + "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "e50ae912813bdfa8372d62daf454f48d6df02297", + "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660", "type": "github" }, "original": { @@ -299,11 +299,11 @@ ] }, "locked": { - "lastModified": 1764612430, - "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", + "lastModified": 1767983607, + "narHash": "sha256-8C2co8NYfR4oMOUEsPROOJ9JHrv9/ktbJJ6X1WsTbXc=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "0d00dc118981531aa731150b6ea551ef037acddd", + "rev": "d4037379e6057246b408bbcf796cf3e9838af5b2", "type": "github" }, "original": { @@ -376,11 +376,11 @@ ] }, "locked": { - "lastModified": 1766160771, - "narHash": "sha256-roINUGikWRqqgKrD4iotKbGj3ZKJl3hjMz5l/SyKrHw=", + "lastModified": 1766253372, + "narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "5ac060bfcf2f12b3a6381156ebbc13826a05b09f", + "rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9", "type": "github" }, "original": { @@ -430,11 +430,11 @@ ] }, "locked": { - "lastModified": 1766253200, - "narHash": "sha256-26qPwrd3od+xoYVywSB7hC2cz9ivN46VPLlrsXyGxvE=", + "lastModified": 1769109506, + "narHash": "sha256-LkQIKoyabNz8EqqAlTTTAcszPl3Dk7df8ctJj7Ah7kc=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "1079777525b30a947c8d657fac158e00ae85de9d", + "rev": "ee9c7e8dc2e1552d1028d18d20ea410f75512f74", "type": "github" }, "original": { @@ -464,11 +464,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1766070988, - "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { @@ -551,11 +551,11 @@ ] }, "locked": { - "lastModified": 1765911976, - "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", + "lastModified": 1769069492, + "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", + "rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d14b595..37b641c 100644 --- a/flake.nix +++ b/flake.nix @@ -41,6 +41,9 @@ (final: prev: { pyprland = pyprland.packages.${final.system}.default; wiremix = wiremix.packages.${final.system}.default; + hyprland = inputs.hyprland.packages.${final.system}.hyprland.overrideAttrs (old: { + buildInputs = (old.buildInputs or [ ]) ++ [ final.glaze ]; + }); }) ]; }; diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/hyprland.nix index e8f038e..d191afd 100644 --- a/modules/home-manager/hyprland.nix +++ b/modules/home-manager/hyprland.nix @@ -1,12 +1,14 @@ -inputs: { +inputs: +{ config, pkgs, ... -}: { - imports = [./hyprland/configuration.nix]; +}: +{ + imports = [ ./hyprland/configuration.nix ]; wayland.windowManager.hyprland = { enable = true; - package = inputs.hyprland.packages.${pkgs.system}.hyprland; + package = pkgs.hyprland; }; services.hyprpolkitagent.enable = true; } diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix index 414d5a8..b6bd8dd 100644 --- a/modules/nixos/hyprland.nix +++ b/modules/nixos/hyprland.nix @@ -7,8 +7,7 @@ inputs: programs.hyprland = { enable = true; xwayland.enable = true; - # package = inputs.hyprland.packages.${pkgs.system}.hyprland; - package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + package = pkgs.hyprland; portalPackage = pkgs.xdg-desktop-portal-hyprland; # Use stable nixpkgs version to fix Qt version mismatch }; } -- knotmirror 0.0.1