mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 22:20:51 +00:00
90b3648f9c
The SYSCONFDIR variable used in the Makefile servers two purposes: 1) During buildPhase, it is hardcoded into the executable as one of the locations that will be searched for the i3blocks.conf config file. We want this set to "/etc", so that "/etc/i3blocks.conf" will be automatically loaded if it exists, as specified in the manpage. 2) During installPhase, it specifies the location that the sample i3blocks.conf should be installed to. We want this to be "$out/etc". Case 2 was already handled correctly, but case 1 was not. This resulted in i3blocks instead searching for i3blocks.conf in the default value of SYSCONFDIR, which is "/usr/local/etc", a directory which generally does not exist on NixOS. This commit remedies this problem by setting SYSCONFDIR=/etc during buildPhase. A minor stylistic fix (correcting a usage of "makeFlags" to "buildFlags" in the expression) has also been applied in this commit. |
||
---|---|---|
.. | ||
blocks-gaps.nix | ||
blocks.nix | ||
default.nix | ||
gaps.nix | ||
lock-color.nix | ||
lock-fancy.nix | ||
lock.nix | ||
pystatus.nix | ||
status.nix |