Merge pull request #71339 from edef1c/i3blocks-xdg

i3blocks: handle multiple XDG_CONFIG_DIRS elements correctly
NixOS · Oct 18, 2019 · 38c0090 · 38c0090
2 parents 0e834b1 + e674377
commit 38c0090
Showing 1 changed file with 10 additions and 1 deletion.
diff --git 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 = {