1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 22:20:51 +00:00
nixpkgs/pkgs/applications/window-managers/i3
Kier Davis 90b3648f9c
i3blocks: search for config in correct system directory
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.
2017-01-12 20:15:15 +00:00
..
blocks-gaps.nix i3-block-gaps: disable darwin 2016-08-16 19:25:42 +00:00
blocks.nix i3blocks: search for config in correct system directory 2017-01-12 20:15:15 +00:00
default.nix i3: 4.12 -> 4.13 2016-11-10 02:45:53 +01:00
gaps.nix i3-gaps: enableParallelBuilding = false; 2016-12-04 16:59:13 +01:00
lock-color.nix i3lock-color: 2.7_rev63a4c23 -> 2.7-2016-09-17 2016-09-19 19:42:40 +02:00
lock-fancy.nix i3lock-fancy: 2016-05-05 -> 2016-10-13 2016-10-15 07:28:14 -04:00
lock.nix i3lock: 2.7 -> 2.8 2016-07-12 11:15:51 +02:00
pystatus.nix i3pystatus: 3.34 -> 3.35 (#18268) 2016-09-04 00:23:21 +02:00
status.nix i3status: 2.9 -> 2.10, fixes #12872 2016-02-08 05:58:20 +01:00