fix: build
This commit is contained in:
@@ -16,9 +16,9 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
my.hm.programs.git.enable = true;
|
|
||||||
my.hm = {
|
my.hm = {
|
||||||
programs.git = {
|
programs.git = {
|
||||||
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
gpg.ssh.allowedSignersFile =
|
gpg.ssh.allowedSignersFile =
|
||||||
(pkgs.writeText "allowed_signers" ''
|
(pkgs.writeText "allowed_signers" ''
|
||||||
|
|||||||
@@ -116,11 +116,14 @@ in
|
|||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
${pkg} = final.symlinkJoin {
|
${pkg} = final.symlinkJoin {
|
||||||
name = prev.${pkg}.name;
|
pname = prev.${pkg}.pname;
|
||||||
|
version = prev.${pkg}.version;
|
||||||
paths = [ prev.${pkg} ];
|
paths = [ prev.${pkg} ];
|
||||||
nativeBuildInputs = [ final.makeWrapper ];
|
nativeBuildInputs = [ final.makeWrapper ];
|
||||||
postBuild = ''
|
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"
|
wrapProgram $out/bin/${exe} --add-flags "--wayland-text-input-version=3"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
@@ -158,7 +161,11 @@ in
|
|||||||
postBuild = lib.concatLines (
|
postBuild = lib.concatLines (
|
||||||
map (
|
map (
|
||||||
desktop:
|
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
|
) desktops
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user