mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-29 09:04:17 +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.
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
diff --git a/src/launch/launcher.c b/src/launch/launcher.c
|
|
index 5bf5cf5..06ce7f4 100644
|
|
--- a/src/launch/launcher.c
|
|
+++ b/src/launch/launcher.c
|
|
@@ -924,9 +924,7 @@ static int launcher_load_standard_session_services(Launcher *launcher, NSSCache
|
|
|
|
static int launcher_load_standard_system_services(Launcher *launcher, NSSCache *nss_cache) {
|
|
static const char *default_data_dirs[] = {
|
|
- "/usr/local/share",
|
|
- "/usr/share",
|
|
- "/lib",
|
|
+ "/run/current-system/sw/share",
|
|
NULL,
|
|
};
|
|
const char *suffix = "dbus-1/system-services";
|
|
@@ -1012,9 +1010,9 @@ static int launcher_parse_config(Launcher *launcher, ConfigRoot **rootp, NSSCach
|
|
if (launcher->configfile)
|
|
configfile = launcher->configfile;
|
|
else if (launcher->user_scope)
|
|
- configfile = "/usr/share/dbus-1/session.conf";
|
|
+ configfile = "/etc/dbus-1/session.conf";
|
|
else
|
|
- configfile = "/usr/share/dbus-1/system.conf";
|
|
+ configfile = "/etc/dbus-1/system.conf";
|
|
|
|
config_parser_init(&parser);
|
|
|