diff --git a/settings/hyprland.nix b/settings/hyprland.nix index 9edb73f..26ee394 100644 --- a/settings/hyprland.nix +++ b/settings/hyprland.nix @@ -2,18 +2,17 @@ { config, pkgs, lib, inputs, ... }: let hyprland-pkgs = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}; - hyprutils = hyprland-pkgs.hyprutils; # hyprutils-0.13.1 was compiled with GCC 15 (requires GLIBCXX_3.4.34) but # its RPATH was patched to gcc-14.3.0-lib which only goes to GLIBCXX_3.4.33. - # Locate gcc-15's libstdc++ from hyprutils's own runtime closure so the - # version is always in sync with whatever hyprland shipped. + # Locate gcc-15's libstdc++ from Hyprland's own runtime closure (hyprutils + # is a transitive dep, so gcc-15-lib will appear here too). gcc15-lib = lib.head (lib.filter (p: lib.hasInfix "gcc-15" p && lib.hasSuffix "-lib" p) (lib.splitString "\n" (lib.removeSuffix "\n" (builtins.readFile - "${pkgs.closureInfo { rootPaths = [ hyprutils ]; }}/store-paths")))); + "${pkgs.closureInfo { rootPaths = [ hyprland-pkgs.hyprland ]; }}/store-paths")))); hyprland-wrapped = (pkgs.symlinkJoin { name = hyprland-pkgs.hyprland.name;