From 7f250e19ef58148351ee0f6a1e80198e4189afde Mon Sep 17 00:00:00 2001 From: imxyy_soope_ Date: Sat, 20 Dec 2025 12:57:47 +0800 Subject: [PATCH] fix: build --- modules/cli/vcs/git.nix | 2 +- modules/i18n/fcitx5.nix | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/modules/cli/vcs/git.nix b/modules/cli/vcs/git.nix index 814ecdf..b290555 100644 --- a/modules/cli/vcs/git.nix +++ b/modules/cli/vcs/git.nix @@ -16,9 +16,9 @@ in }; config = lib.mkIf cfg.enable { - my.hm.programs.git.enable = true; my.hm = { programs.git = { + enable = true; settings = { gpg.ssh.allowedSignersFile = (pkgs.writeText "allowed_signers" '' diff --git a/modules/i18n/fcitx5.nix b/modules/i18n/fcitx5.nix index 8220888..18ea1eb 100644 --- a/modules/i18n/fcitx5.nix +++ b/modules/i18n/fcitx5.nix @@ -116,11 +116,14 @@ in }: { ${pkg} = final.symlinkJoin { - name = prev.${pkg}.name; + pname = prev.${pkg}.pname; + version = prev.${pkg}.version; paths = [ prev.${pkg} ]; nativeBuildInputs = [ final.makeWrapper ]; postBuild = '' - substituteInPlace $out/share/applications/${desktop}.desktop --replace-quiet "${prev.${pkg}}" $out + rm $out/share/applications/${desktop}.desktop + substitute ${prev.${pkg}}/share/applications/${desktop}.desktop $out/share/applications/${desktop}.desktop \ + --replace-quiet "${prev.${pkg}}" $out wrapProgram $out/bin/${exe} --add-flags "--wayland-text-input-version=3" ''; }; @@ -158,7 +161,11 @@ in postBuild = lib.concatLines ( map ( desktop: - "substituteInPlace $out/share/applications/${desktop}.desktop --replace-fail 'Exec=' 'Exec=env QT_IM_MODULE=fcitx XMODIFIERS=@im=fcitx '" + '' + rm $out/share/applications/${desktop}.desktop + substitute ${prev.${pkg}}/share/applications/${desktop}.desktop $out/share/applications/${desktop}.desktop \ + --replace-fail 'Exec=' 'Exec=env QT_IM_MODULE=fcitx XMODIFIERS=@im=fcitx ' + '' ) desktops ); };