summary refs log tree commit diff
path: root/pkgs/applications/window-managers/i3
diff options
context:
space:
mode:
authoredef <edef@edef.eu>2019-10-17 18:14:15 +0000
committeredef <edef@edef.eu>2019-10-18 20:22:16 +0000
commite674377177de850aef7b317e646e54f336a5c2be (patch)
tree7ec05c8a81bc166196ca79a9f4c8dedbc78dda83 /pkgs/applications/window-managers/i3
parentf702ae151685e0b29f73e71dfbf8fcdcb7d903b0 (diff)
downloadnixpkgs-e674377177de850aef7b317e646e54f336a5c2be.tar
nixpkgs-e674377177de850aef7b317e646e54f336a5c2be.tar.gz
nixpkgs-e674377177de850aef7b317e646e54f336a5c2be.tar.bz2
nixpkgs-e674377177de850aef7b317e646e54f336a5c2be.tar.lz
nixpkgs-e674377177de850aef7b317e646e54f336a5c2be.tar.xz
nixpkgs-e674377177de850aef7b317e646e54f336a5c2be.tar.zst
nixpkgs-e674377177de850aef7b317e646e54f336a5c2be.zip
i3blocks: handle multiple XDG_CONFIG_DIRS elements correctly
On NixOS, $XDG_CONFIG_DIRS always has multiple elements.
Without this patch, it'll try to open() a rather nonsensical
path full of colons.
Diffstat (limited to 'pkgs/applications/window-managers/i3')
-rw-r--r--pkgs/applications/window-managers/i3/blocks.nix11
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 ef03216d499..15bd5e74cdc 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 = {