From 627f9c31f6cb2dc038f938797d4e50752e7376f9 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Tue, 17 Dec 2024 18:14:14 -0500 Subject: [PATCH] fix(hypr): override stdenv for hyprlandPlugins --- modules/desktop/environment/home/hyprexpo.nix | 5 +++- overlays/build-failures/default.nix | 23 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/modules/desktop/environment/home/hyprexpo.nix b/modules/desktop/environment/home/hyprexpo.nix index 65dfb5ca..97f43d3d 100644 --- a/modules/desktop/environment/home/hyprexpo.nix +++ b/modules/desktop/environment/home/hyprexpo.nix @@ -3,7 +3,10 @@ self: {pkgs, ...}: let in { config = { wayland.windowManager.hyprland = { - plugins = [self.inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo]; + # FIXME: https://pr-tracker.nelim.org/?pr=365776 + plugins = [(self.inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo.override { + hyprlandPlugins = pkgs.hyprlandPlugins; + })]; settings = { plugin.hyprexpo = { diff --git a/overlays/build-failures/default.nix b/overlays/build-failures/default.nix index 732eb07d..6653f999 100644 --- a/overlays/build-failures/default.nix +++ b/overlays/build-failures/default.nix @@ -1,4 +1,27 @@ final: prev: { # FIXME: https://pr-tracker.nelim.org/?pr=357699 nodejs_latest = prev.nodejs_22; + + # FIXME: https://pr-tracker.nelim.org/?pr=365776 + hyprlandPlugins = + prev.hyprlandPlugins + // { + mkHyprlandPlugin = hyprland: args @ {pluginName, ...}: + hyprland.stdenv.mkDerivation ( + args + // { + pname = "${pluginName}"; + nativeBuildInputs = [final.pkg-config] ++ args.nativeBuildInputs or []; + buildInputs = [hyprland] ++ hyprland.buildInputs ++ (args.buildInputs or []); + meta = + args.meta + // { + description = args.meta.description or ""; + longDescription = + (args.meta.longDescription or "") + + "\n\nPlugins can be installed via a plugin entry in the Hyprland NixOS or Home Manager options."; + }; + } + ); + }; }