From 5ae966b9dcdf07cd5ac4534edcab2a1b67596b17 Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Wed, 29 Oct 2025 13:07:25 -0300 Subject: [PATCH] libcosmicAppHook: include only fallback themes from settings --- pkgs/by-name/li/libcosmicAppHook/package.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libcosmicAppHook/package.nix b/pkgs/by-name/li/libcosmicAppHook/package.nix index f4bc7bd4f34f..f3042e13ac8e 100644 --- a/pkgs/by-name/li/libcosmicAppHook/package.nix +++ b/pkgs/by-name/li/libcosmicAppHook/package.nix @@ -7,6 +7,7 @@ lib, stdenv, makeSetupHook, + runCommand, makeBinaryWrapper, pkg-config, targetPackages, @@ -44,8 +45,16 @@ makeSetupHook { ]; substitutions = { - fallbackXdgDirs = "${lib.optionalString includeSettings "${targetPackages.cosmic-settings}/share:"}${targetPackages.cosmic-icons}/share"; - + fallbackXdgDirs = + let + fallbackThemes = runCommand "cosmic-fallback-themes" { } '' + mkdir -p $out/share + ln -s ${targetPackages.cosmic-settings}/share/cosmic $out/share/cosmic + ''; + in + lib.makeSearchPath "share" ( + lib.optionals includeSettings [ fallbackThemes ] ++ [ targetPackages.cosmic-icons ] + ); cargoLinkerVar = targetPackages.stdenv.hostPlatform.rust.cargoEnvVarTarget; # force linking for all libraries that may be dlopen'd by libcosmic/iced apps cargoLinkLibs = lib.escapeShellArgs (