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
788 B
Diff
26 lines
788 B
Diff
diff --git a/g15daemon/main.c b/g15daemon/main.c
|
|
index e674475..97b8242 100644
|
|
--- a/g15daemon/main.c
|
|
+++ b/g15daemon/main.c
|
|
@@ -574,7 +574,7 @@ exitnow:
|
|
g15daemon_quit_refresh();
|
|
uf_conf_write(lcdlist,"/etc/g15daemon.conf");
|
|
uf_conf_free(lcdlist);
|
|
- unlink("/var/run/g15daemon.pid");
|
|
+ unlink("/run/g15daemon/g15daemon.pid");
|
|
}
|
|
return 0;
|
|
}
|
|
diff --git a/g15daemon/utility_funcs.c b/g15daemon/utility_funcs.c
|
|
index c93d164..2e9c679 100644
|
|
--- a/g15daemon/utility_funcs.c
|
|
+++ b/g15daemon/utility_funcs.c
|
|
@@ -48,7 +48,7 @@
|
|
|
|
extern unsigned int g15daemon_debug;
|
|
extern volatile int leaving;
|
|
-#define G15DAEMON_PIDFILE "/var/run/g15daemon.pid"
|
|
+#define G15DAEMON_PIDFILE "/run/g15daemon/g15daemon.pid"
|
|
|
|
pthread_cond_t lcd_refresh = PTHREAD_COND_INITIALIZER;
|