diff options
| author | Matthew Harm Bekkema <id@mbekkema.name> | 2019-12-03 20:50:42 +1100 |
|---|---|---|
| committer | Matthew Harm Bekkema <id@mbekkema.name> | 2019-12-04 12:26:30 +1100 |
| commit | f83a83f964a9894a837788d0253888187cfa4778 (patch) | |
| tree | c2fe2c3536873b58bb40f116918a53e33d3957b0 /pkgs/os-specific/linux | |
| parent | aecfea098e17eaf5cd4a80fab440e0e29b12420c (diff) | |
| download | nixpkgs-f83a83f964a9894a837788d0253888187cfa4778.tar nixpkgs-f83a83f964a9894a837788d0253888187cfa4778.tar.gz nixpkgs-f83a83f964a9894a837788d0253888187cfa4778.tar.bz2 nixpkgs-f83a83f964a9894a837788d0253888187cfa4778.tar.lz nixpkgs-f83a83f964a9894a837788d0253888187cfa4778.tar.xz nixpkgs-f83a83f964a9894a837788d0253888187cfa4778.tar.zst nixpkgs-f83a83f964a9894a837788d0253888187cfa4778.zip | |
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.
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/upower/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index d787acae61b..ab7f65925ee 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -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; { |