Wrap tofi without forcing a rebuild.

This commit is contained in:
Tom Alexander 2025-01-19 10:35:31 -05:00
parent 2aca77ea1a
commit 8d911ff893
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
2 changed files with 7 additions and 13 deletions

View File

@ -109,7 +109,7 @@
randomizedDelaySec = "14m"; randomizedDelaySec = "14m";
options = "--delete-older-than 30d"; options = "--delete-older-than 30d";
}; };
# nix.settings.auto-optimise-store = true; nix.settings.auto-optimise-store = !config.me.buildingIso;
# Use doas instead of sudo # Use doas instead of sudo
security.doas.enable = true; security.doas.enable = true;

View File

@ -40,11 +40,6 @@ in
(final: prev: { (final: prev: {
rofimoji = prev.rofimoji.overrideAttrs (old: { rofimoji = prev.rofimoji.overrideAttrs (old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.tofi ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.tofi ];
# postInstall =
# old.postInstall
# + ''
# wrapProgram $out/bin/rofimoji --prefix PATH : ${lib.makeBinPath [ pkgs.wofi ]}
# '';
src = builtins.fetchGit { src = builtins.fetchGit {
# https://github.com/fdw/rofimoji/issues/209 # https://github.com/fdw/rofimoji/issues/209
url = "https://github.com/fdw/rofimoji.git"; url = "https://github.com/fdw/rofimoji.git";
@ -53,17 +48,16 @@ in
}); });
}) })
(final: prev: { (final: prev: {
tofi = prev.tofi.overrideAttrs (old: { tofi = pkgs.symlinkJoin {
nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkgs.makeWrapper ]; name = "tofi";
postInstall = paths = [ prev.tofi ];
old.postInstall or "" buildInputs = [ pkgs.makeWrapper ];
+ '' postBuild = ''
wrapProgram $out/bin/tofi-drun --add-flags --font=${pkgs.source-sans-pro}/share/fonts/opentype/SourceSansPro-Regular.otf --add-flags --config=${./files/tofi-config} wrapProgram $out/bin/tofi-drun --add-flags --font=${pkgs.source-sans-pro}/share/fonts/opentype/SourceSansPro-Regular.otf --add-flags --config=${./files/tofi-config}
wrapProgram $out/bin/tofi --add-flags --config=${./files/tofi-config} wrapProgram $out/bin/tofi --add-flags --config=${./files/tofi-config}
''; '';
}); };
}) })
]; ];
}; };
} }