upower: load config from /etc
In the process of making UPower.conf customizable (#73968), it came up that UPower doesn't load its config from /etc by default. The UPower derivation is modified to make it load its config from /etc at runtime, but still install the default config to its nix store path as before. The UPower module is modified to put the config in /etc.
This commit is contained in:
@@ -52,12 +52,14 @@ stdenv.mkDerivation {
|
||||
"--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
|
||||
"--with-systemdutildir=${placeholder "out"}/lib/systemd"
|
||||
"--with-udevrulesdir=${placeholder "out"}/lib/udev/rules.d"
|
||||
"--sysconfdir=/etc"
|
||||
];
|
||||
|
||||
doCheck = false; # fails with "env: './linux/integration-test': No such file or directory"
|
||||
|
||||
installFlags = [
|
||||
"historydir=$(TMPDIR)/foo"
|
||||
"sysconfdir=${placeholder "out"}/etc"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
Reference in New Issue
Block a user