Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: ee966005a7ad
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 740d857b5cb9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 12, 2017

  1. 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.
    kierdavis committed Jan 12, 2017
    Configuration menu
    Copy the full SHA
    90b3648 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2017

  1. Merge pull request #21839 from kierdavis/i3blocks-sysconfdir

    i3blocks: search for config in correct system directory
    7c6f434c committed Jan 13, 2017
    Configuration menu
    Copy the full SHA
    740d857 View commit details
    Browse the repository at this point in the history