mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-03 20:33:21 +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.
26 lines
676 B
Diff
26 lines
676 B
Diff
diff --git a/src/common.c b/src/common.c
|
|
index 1da1c45..fb68ada 100644
|
|
--- a/src/common.c
|
|
+++ b/src/common.c
|
|
@@ -113,13 +113,13 @@ char *get_config_path(char* default_path, char* pbuf, size_t bufsize) {
|
|
if(check_path(path))
|
|
goto have;
|
|
|
|
- // priority 4: $SYSCONFDIR/proxychains.conf
|
|
- path = SYSCONFDIR "/" PROXYCHAINS_CONF_FILE;
|
|
+ // priority 4: /etc/proxychains.conf
|
|
+ path = "/etc/" PROXYCHAINS_CONF_FILE;
|
|
if(check_path(path))
|
|
goto have;
|
|
|
|
- // priority 5: /etc/proxychains.conf
|
|
- path = "/etc/" PROXYCHAINS_CONF_FILE;
|
|
+ // priority 5: $SYSCONFDIR/proxychains.conf
|
|
+ path = SYSCONFDIR "/" PROXYCHAINS_CONF_FILE;
|
|
if(check_path(path))
|
|
goto have;
|
|
|
|
--
|
|
2.37.2
|
|
|