diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-10-18 20:33:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-18 20:33:11 +0000 |
| commit | 38c009010401157c6621823ad5907e6f10be5192 (patch) | |
| tree | e3733b4062e0f2c491129158ce27943e36d732f3 /pkgs | |
| parent | 0e834b10f748634278dc6be44ad4a5779a1f443e (diff) | |
| parent | e674377177de850aef7b317e646e54f336a5c2be (diff) | |
| download | nixlib-38c009010401157c6621823ad5907e6f10be5192.tar nixlib-38c009010401157c6621823ad5907e6f10be5192.tar.gz nixlib-38c009010401157c6621823ad5907e6f10be5192.tar.bz2 nixlib-38c009010401157c6621823ad5907e6f10be5192.tar.lz nixlib-38c009010401157c6621823ad5907e6f10be5192.tar.xz nixlib-38c009010401157c6621823ad5907e6f10be5192.tar.zst nixlib-38c009010401157c6621823ad5907e6f10be5192.zip | |
Merge pull request #71339 from edef1c/i3blocks-xdg
i3blocks: handle multiple XDG_CONFIG_DIRS elements correctly
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/window-managers/i3/blocks.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix index ef03216d499b..15bd5e74cdc8 100644 --- a/pkgs/applications/window-managers/i3/blocks.nix +++ b/pkgs/applications/window-managers/i3/blocks.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, autoreconfHook }: +{ fetchFromGitHub, fetchpatch, stdenv, autoreconfHook }: with stdenv.lib; @@ -13,6 +13,15 @@ stdenv.mkDerivation { sha256 = "1fx4230lmqa5rpzph68dwnpcjfaaqv5gfkradcr85hd1z8d1qp1b"; }; + patches = [ + # XDG_CONFIG_DIRS can contain multiple elements separated by colons, which should be searched in order. + (fetchpatch { + # https://github.com/vivien/i3blocks/pull/405 + url = https://github.com/edef1c/i3blocks/commit/d57b32f9a364aeaf36869efdd54240433c737e57.patch; + sha256 = "102xb0ax0hmg82dz2gzfag470dkckzf2yizai0izacvrz0d3ngj1"; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; meta = { |