3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/applications
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
..
altcoins stellar-core: init at 0.5.1 2017-01-03 22:06:47 -05:00
audio ingen: fix evaluation 2017-01-11 09:17:55 +01:00
backup add self to crashplan maintainers 2016-11-13 14:41:57 -05:00
display-managers treewide: quote URLs in my packages 2016-11-24 01:17:52 +03:00
editors Merge pull request #21826 from mdorman/emacs-updates 2017-01-12 06:48:36 -06:00
gis Fiddle LD_LIBRARY_PATH to include GDAL 2016-12-16 15:10:23 +00:00
graphics Merge pull request #20658 from matthewbauer/gimp-darwin 2017-01-11 21:47:29 +01:00
inferno
misc ding: 1.8 -> 1.8.1 2017-01-11 15:34:52 +01:00
networking Merge pull request #21824 from peterhoeg/u/dropbox 2017-01-12 07:29:45 -05:00
office mmex: v1.2.7 -> v1.3.1 (#21755) 2017-01-09 07:26:06 +01:00
science Merge pull request #21632 from veprbl/sherpa_fix 2017-01-09 09:58:22 +00:00
search
taxes
version-management hub: 2.2.8 -> 2.2.9 2017-01-09 19:10:18 -06:00
video avidemux: 2.6.16 -> 2.6.18 2017-01-12 20:13:12 +01:00
virtualization rkt: 1.21.0 -> 1.22.0 2017-01-11 17:27:19 -05:00
window-managers i3blocks: search for config in correct system directory 2017-01-12 20:15:15 +00:00