JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,784 Commits 2 Branches 0 Tags 13 GiB
90b3648f9c
Go to file
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
.github CONTRIBUTING.md: switch to a link that actually works 2016-11-24 10:01:16 +01:00
doc Docs Python: fix examples and links 2016-12-21 15:45:39 +01:00
lib Merge pull request #21750 from knedlsepp/fix-grib-problems 2017-01-09 09:28:07 +00:00
maintainers update.nix moved to maintainers/scripts/update.nix 2016-12-18 16:45:33 +01:00
nixos nixos: fix terminal-server, fixes #21834 2017-01-12 16:41:33 +01:00
pkgs i3blocks: search for config in correct system directory 2017-01-12 20:15:15 +00:00
.editorconfig add .editorconfig 2016-10-02 22:10:43 +02:00
.gitignore
.mention-bot include me in mention bot for darwin 2016-12-09 21:19:32 +01:00
.travis.yml travis: also evaluate nixpkgs-unstable 2016-12-15 22:43:14 +01:00
.version unstable is now 17.03 2016-09-02 08:47:21 +02:00
COPYING Time passing by 2017-01-01 21:35:52 +01:00
default.nix Separate fix-point from config importing hacks and other impurities 2016-07-14 14:33:23 -07:00
README.md README: Update to 16.09 2016-10-04 17:45:24 +02:00

README.md

logo

Build Status Code Triagers Badge

Nixpkgs is a collection of packages for the Nix package manager. It is periodically built and tested by the hydra build daemon as so-called channels. To get channel information via git, add nixpkgs-channels as a remote:

% git remote add channels git://github.com/NixOS/nixpkgs-channels.git

For stability and maximum binary package support, it is recommended to maintain custom changes on top of one of the channels, e.g. nixos-16.09 for the latest release and nixos-unstable for the latest successful build of master:

% git remote update channels
% git rebase channels/nixos-16.09

For pull-requests, please rebase onto nixpkgs master.

NixOS linux distribution source code is located inside nixos/ folder.

Communication: