mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-26 06:44:06 +00:00
571c71e6f7
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
22 lines
844 B
Diff
22 lines
844 B
Diff
diff --git a/src/plugins/controls/label-freetype/plugin.c b/src/plugins/controls/label-freetype/plugin.c
|
|
index 917b04c0..83f2bec2 100644
|
|
--- a/src/plugins/controls/label-freetype/plugin.c
|
|
+++ b/src/plugins/controls/label-freetype/plugin.c
|
|
@@ -127,7 +127,7 @@ find_default_font_path (void)
|
|
FILE *fp;
|
|
static char fc_match_out[PATH_MAX];
|
|
|
|
- fp = popen ("/usr/bin/fc-match -f %{file}", "r");
|
|
+ fp = popen ("@fcmatch@ -f %{file}", "r");
|
|
if (!fp)
|
|
return FONT_FALLBACK;
|
|
|
|
@@ -144,7 +144,7 @@ find_default_monospace_font_path (void)
|
|
FILE *fp;
|
|
static char fc_match_out[PATH_MAX];
|
|
|
|
- fp = popen ("/usr/bin/fc-match -f %{file} monospace", "r");
|
|
+ fp = popen ("@fcmatch@ -f %{file} monospace", "r");
|
|
if (!fp)
|
|
return MONOSPACE_FONT_FALLBACK;
|