mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 07:05:13 +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.
27 lines
910 B
Diff
27 lines
910 B
Diff
diff --git a/core/config_reader.c b/core/config_reader.c
|
|
index 451fc48..ed45f4d 100644
|
|
--- a/core/config_reader.c
|
|
+++ b/core/config_reader.c
|
|
@@ -1355,7 +1355,7 @@ int read_config_file(const char* file)
|
|
char file_path[PATH_MAX];
|
|
|
|
snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, file);
|
|
-
|
|
+ snprintf(file_path, sizeof(file_path), "%s", file);
|
|
if(read_file(file_path) == -1)
|
|
{
|
|
gerror("read_file failed\n");
|
|
diff --git a/core/gimx.c b/core/gimx.c
|
|
index 700cae9..9143d8b 100755
|
|
--- a/core/gimx.c
|
|
+++ b/core/gimx.c
|
|
@@ -192,7 +192,7 @@ void show_config()
|
|
char file_path[PATH_MAX];
|
|
|
|
snprintf(file_path, sizeof(file_path), "%s%s%s%s", gimx_params.homedir, GIMX_DIR, CONFIG_DIR, gimx_params.config_file);
|
|
-
|
|
+ snprintf(file_path, sizeof(file_path), "%s", gimx_params.config_file);
|
|
FILE * fp = gfile_fopen(file_path, "r");
|
|
if (fp == NULL)
|
|
{
|